mastofe

commit: 9e3c4fd2d7ae0bc0963c319079c3f579315ae5db
parent: 89e8e110c80e2ba18cbf8a862db8bf71e1678543
Author: Jantso Porali <jantso.porali@gmail.com>
Date:   Tue, 11 Apr 2017 21:41:29 +0200

Update language files (#1516)

* update faq with default language

* update translation for about page

* update Minio config

Thanks to @Gargon for helping me. I hope this will help others as well

* update import and export translation

* translate emails to finnish

* add finnish translation for emails

* add finnish translation for emails

* add finnish translation

* add missing dot

* update finnish language to emails

* add finnish translation for emails

* add dot and fix typo

* updated some minor typos

* remove language change due breaking emails

And by dev request

* updated minio config by dev request

* updated about page translation

* fix for Amazon S3/Minio instance setups

If you were using S3 or Minio for your files, this will fix the Import issue :)

* update translation according to issue #1515

See issue #1515

* update translation for issue #1515

see issue #1515

Diffstat:
M
config/locales/devise.en.yml
2
+-
M
config/locales/devise.fi.yml
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
@@ -29,7 +29,7 @@ en:
       success: Successfully authenticated from %{kind} account.
     passwords:
       no_token: You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided.
-      send_instructions: You will receive an email with instructions on how to reset your password in a few minutes.
+      send_instructions: If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes.
       send_paranoid_instructions: If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes.
       updated: Your password has been changed successfully. You are now signed in.
       updated_not_active: Your password has been changed successfully.
diff --git a/config/locales/devise.fi.yml b/config/locales/devise.fi.yml
@@ -29,7 +29,7 @@ fi:
       success: Onnistuneesti varmennettu %{kind} tilillä.
     passwords:
       no_token: Et pääse tälle sivulle ilman salasanan vaihto sähköpostia. Jos tulet tämmöisestä postista, varmista että sinulla on täydellinen URL.
-      send_instructions: Saat sähköpostitse ohjeet salasanan palautukseen muutaman minuutin kuluessa.
+      send_instructions:  Jos sähköpostisi on meidän tietokannassa, saat pian ohjeet salasanan palautukseen.
       send_paranoid_instructions: Jos sähköpostisi on meidän tietokannassa, saat pian ohjeet salasanan palautukseen.
       updated: Salasanasi vaihdettu onnistuneesti. Olet nyt kirjautunut sisään.
       updated_not_active: Salasanasi vaihdettu onnistuneesti.