diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-02-26 17:04:44 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-02-26 17:04:44 +0100 |
| commit | 0158937fc2345a83f8ee5a64e85b14cabfe4b1e7 (patch) | |
| tree | 79872e72c27d6371620c0dd8f04700aa0094020c /config/locales/devise.fa.yml | |
| parent | d82de360c13894746d3974d11c9505c8937ebdee (diff) | |
| parent | a5e7ada62fa2824be158f0b3bed7f3c39ce9c0fa (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - Dockerfile Took upstream version and reverted f13ebd02c91776ddb88b5178bf9015c6e0f1ca80. Hopefuly it's not needed anymore. - app/controllers/api/v1/search_controller.rb The conflict was due to us raising the number of results returned. Upstream raised it further, so took it. - config/locales/de.yml Took upstream changes to theme translation strings. - config/locales/gl.yml Took upstream changes to theme translation strings. - config/locales/nl.yml Took upstream changes to theme translation strings. - config/locales/sk.yml Took upstream changes to theme translation strings.
Diffstat (limited to 'config/locales/devise.fa.yml')
| -rw-r--r-- | config/locales/devise.fa.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/devise.fa.yml b/config/locales/devise.fa.yml index e6e16b4b4..1375c43f5 100644 --- a/config/locales/devise.fa.yml +++ b/config/locales/devise.fa.yml @@ -18,6 +18,7 @@ fa: mailer: confirmation_instructions: action: تأیید نشانی ایمیل + action_with_app: تأیید و بازگشت به %{app} explanation: شما با این نشانی ایمیل حسابی در %{host} باز کرده‌اید. با یک کلیک می‌توانید این حساب را فعال کنید. اگر شما چنین کاری نکردید، لطفاً این ایمیل را نادیده بگیرید. extra_html: لطفاً همچنین <a href="%{terms_path}">قانون‌های این سرور</a> و <a href="%{policy_path}">شرایط کاربری</a> آن را ببینید. subject: 'ماستدون: راهنمایی برای تأیید %{instance}' |