aboutsummaryrefslogtreecommitdiff
path: root/app/i18n
diff options
context:
space:
mode:
Diffstat (limited to 'app/i18n')
-rw-r--r--app/i18n/cz/admin.php1
-rw-r--r--app/i18n/cz/conf.php1
-rw-r--r--app/i18n/cz/gen.php1
-rw-r--r--app/i18n/cz/user.php32
-rw-r--r--app/i18n/de/admin.php1
-rw-r--r--app/i18n/de/conf.php1
-rw-r--r--app/i18n/de/gen.php1
-rw-r--r--app/i18n/de/user.php32
-rw-r--r--app/i18n/en/admin.php1
-rw-r--r--app/i18n/en/conf.php1
-rw-r--r--app/i18n/en/gen.php1
-rw-r--r--app/i18n/en/user.php32
-rwxr-xr-xapp/i18n/es/admin.php1
-rwxr-xr-xapp/i18n/es/conf.php1
-rwxr-xr-xapp/i18n/es/gen.php1
-rw-r--r--app/i18n/es/user.php32
-rw-r--r--app/i18n/fr/admin.php1
-rw-r--r--app/i18n/fr/conf.php1
-rw-r--r--app/i18n/fr/gen.php1
-rw-r--r--app/i18n/fr/user.php32
-rw-r--r--app/i18n/he/admin.php1
-rw-r--r--app/i18n/he/conf.php1
-rw-r--r--app/i18n/he/gen.php1
-rw-r--r--app/i18n/he/user.php32
-rw-r--r--app/i18n/it/admin.php1
-rw-r--r--app/i18n/it/conf.php1
-rw-r--r--app/i18n/it/gen.php1
-rw-r--r--app/i18n/it/user.php32
-rw-r--r--app/i18n/kr/admin.php1
-rw-r--r--app/i18n/kr/conf.php1
-rw-r--r--app/i18n/kr/gen.php1
-rw-r--r--app/i18n/kr/user.php32
-rw-r--r--app/i18n/nl/admin.php1
-rw-r--r--app/i18n/nl/conf.php1
-rw-r--r--app/i18n/nl/gen.php1
-rw-r--r--app/i18n/nl/user.php32
-rw-r--r--app/i18n/oc/admin.php1
-rw-r--r--app/i18n/oc/conf.php1
-rw-r--r--app/i18n/oc/gen.php1
-rw-r--r--app/i18n/oc/user.php32
-rw-r--r--app/i18n/pt-br/admin.php1
-rw-r--r--app/i18n/pt-br/conf.php1
-rw-r--r--app/i18n/pt-br/gen.php1
-rw-r--r--app/i18n/pt-br/user.php32
-rw-r--r--app/i18n/ru/admin.php1
-rw-r--r--app/i18n/ru/conf.php1
-rw-r--r--app/i18n/ru/gen.php1
-rw-r--r--app/i18n/ru/user.php32
-rw-r--r--app/i18n/tr/admin.php1
-rw-r--r--app/i18n/tr/conf.php1
-rw-r--r--app/i18n/tr/gen.php1
-rw-r--r--app/i18n/tr/user.php32
-rw-r--r--app/i18n/zh-cn/admin.php1
-rw-r--r--app/i18n/zh-cn/conf.php1
-rw-r--r--app/i18n/zh-cn/gen.php1
-rw-r--r--app/i18n/zh-cn/user.php32
56 files changed, 490 insertions, 0 deletions
diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php
index 68127f571..a2a509560 100644
--- a/app/i18n/cz/admin.php
+++ b/app/i18n/cz/admin.php
@@ -163,6 +163,7 @@ return array(
'help' => 'in seconds', //TODO - Translation
'number' => 'Duration to keep logged in', //TODO - Translation
),
+ 'force_email_validation' => 'Force email addresses validation', //TODO - Translation
'instance-name' => 'Instance name', //TODO - Translation
'max-categories' => 'Categories per user limit', //TODO - Translation
'max-feeds' => 'Feeds per user limit', //TODO - Translation
diff --git a/app/i18n/cz/conf.php b/app/i18n/cz/conf.php
index 8a21067ee..cd7535571 100644
--- a/app/i18n/cz/conf.php
+++ b/app/i18n/cz/conf.php
@@ -46,6 +46,7 @@ return array(
'_' => 'Smazání účtu',
'warn' => 'Váš účet bude smazán spolu se všemi souvisejícími daty',
),
+ 'email' => 'Email',
'password_api' => 'Password API<br /><small>(tzn. pro mobilní aplikace)</small>',
'password_form' => 'Heslo<br /><small>(pro přihlášení webovým formulářem)</small>',
'password_format' => 'Alespoň 7 znaků',
diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index f1a412252..990ff0c30 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -3,6 +3,7 @@
return array(
'action' => array(
'actualize' => 'Aktualizovat',
+ 'back' => '← Go back', //TODO - Translation
'back_to_rss_feeds' => '← Zpět na seznam RSS kanálů',
'cancel' => 'Zrušit',
'create' => 'Vytvořit',
diff --git a/app/i18n/cz/user.php b/app/i18n/cz/user.php
new file mode 100644
index 000000000..4f2cfcda2
--- /dev/null
+++ b/app/i18n/cz/user.php
@@ -0,0 +1,32 @@
+<?php
+
+return array(
+ 'email' => array(
+ 'feedback' => array(
+ 'invalid' => 'The email address is invalid.', //TODO - Translation
+ 'required' => 'The email address is required.', //TODO - Translation
+ ),
+ 'validation' => array(
+ 'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.', //TODO - Translation
+ 'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.', //TODO - Translation
+ 'feedback' => array(
+ 'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //TODO - Translation
+ 'email_sent' => 'An email has been sent to your address.', //TODO - Translation
+ 'error' => 'The email address failed to be validated.', //TODO - Translation
+ 'ok' => 'The email address has been validated.', //TODO - Translation
+ 'unneccessary' => 'The email address was already validated.', //TODO - Translation
+ 'wrong_token' => 'The email address failed to be validated due to a wrong token.', //TODO - Translation
+ ),
+ 'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
+ 'resend_email' => 'Resend the email', //TODO - Translation
+ 'title' => 'Email address validation', //TODO - Translation
+ ),
+ ),
+ 'mailer' => array(
+ 'email_need_validation' => array(
+ 'title' => 'You need to validate your account', //TODO - Translation
+ 'welcome' => 'Welcome %s,', //TODO - Translation
+ 'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+ ),
+ ),
+);
diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php
index f0307dcab..d075bf28f 100644
--- a/app/i18n/de/admin.php
+++ b/app/i18n/de/admin.php
@@ -159,6 +159,7 @@ return array(
'system' => array(
'_' => 'Systemeinstellungen',
'auto-update-url' => 'Auto-update URL',
+ 'force_email_validation' => 'Force email addresses validation', //TODO - Translation
'instance-name' => 'Dein Reader Name',
'max-categories' => 'Anzahl erlaubter Kategorien pro Benutzer',
'max-feeds' => 'Anzahl erlaubter Feeds pro Benutzer',
diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php
index 37a67eb15..99225da9c 100644
--- a/app/i18n/de/conf.php
+++ b/app/i18n/de/conf.php
@@ -46,6 +46,7 @@ return array(
'_' => 'Accountlöschung',
'warn' => 'Dein Account und alle damit bezogenen Daten werden gelöscht.',
),
+ 'email' => 'E-Mail-Adresse',
'password_api' => 'Passwort-API<br /><small>(z. B. für mobile Anwendungen)</small>',
'password_form' => 'Passwort<br /><small>(für die Anmeldemethode per Webformular)</small>',
'password_format' => 'mindestens 7 Zeichen',
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index 93bd62d41..135263d28 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -3,6 +3,7 @@
return array(
'action' => array(
'actualize' => 'Aktualisieren',
+ 'back' => '← Go back', //TODO - Translation
'back_to_rss_feeds' => '← Zurück zu Ihren RSS-Feeds gehen',
'cancel' => 'Abbrechen',
'create' => 'Erstellen',
diff --git a/app/i18n/de/user.php b/app/i18n/de/user.php
new file mode 100644
index 000000000..4f2cfcda2
--- /dev/null
+++ b/app/i18n/de/user.php
@@ -0,0 +1,32 @@
+<?php
+
+return array(
+ 'email' => array(
+ 'feedback' => array(
+ 'invalid' => 'The email address is invalid.', //TODO - Translation
+ 'required' => 'The email address is required.', //TODO - Translation
+ ),
+ 'validation' => array(
+ 'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.', //TODO - Translation
+ 'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.', //TODO - Translation
+ 'feedback' => array(
+ 'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //TODO - Translation
+ 'email_sent' => 'An email has been sent to your address.', //TODO - Translation
+ 'error' => 'The email address failed to be validated.', //TODO - Translation
+ 'ok' => 'The email address has been validated.', //TODO - Translation
+ 'unneccessary' => 'The email address was already validated.', //TODO - Translation
+ 'wrong_token' => 'The email address failed to be validated due to a wrong token.', //TODO - Translation
+ ),
+ 'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
+ 'resend_email' => 'Resend the email', //TODO - Translation
+ 'title' => 'Email address validation', //TODO - Translation
+ ),
+ ),
+ 'mailer' => array(
+ 'email_need_validation' => array(
+ 'title' => 'You need to validate your account', //TODO - Translation
+ 'welcome' => 'Welcome %s,', //TODO - Translation
+ 'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+ ),
+ ),
+);
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 004089ffc..c5ab183e8 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -159,6 +159,7 @@ return array(
'system' => array(
'_' => 'System configuration',
'auto-update-url' => 'Auto-update server URL',
+ 'force_email_validation' => 'Force email addresses validation',
'instance-name' => 'Instance name',
'max-categories' => 'Categories per user limit',
'max-feeds' => 'Feeds per user limit',
diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index 8193233ce..1078c736c 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -46,6 +46,7 @@ return array(
'_' => 'Account deletion',
'warn' => 'Your account and all related data will be deleted.',
),
+ 'email' => 'Email address',
'password_api' => 'API password<br /><small>(e.g., for mobile apps)</small>',
'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
'password_format' => 'At least 7 characters',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 655b02402..470c27234 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -3,6 +3,7 @@
return array(
'action' => array(
'actualize' => 'Actualize',
+ 'back' => '← Go back',
'back_to_rss_feeds' => '← Go back to your RSS feeds',
'cancel' => 'Cancel',
'create' => 'Create',
diff --git a/app/i18n/en/user.php b/app/i18n/en/user.php
new file mode 100644
index 000000000..5b4cd4fcb
--- /dev/null
+++ b/app/i18n/en/user.php
@@ -0,0 +1,32 @@
+<?php
+
+return array(
+ 'email' => array(
+ 'feedback' => array(
+ 'invalid' => 'The email address is invalid.',
+ 'required' => 'The email address is required.',
+ ),
+ 'validation' => array(
+ 'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.',
+ 'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.',
+ 'feedback' => array(
+ 'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.',
+ 'email_sent' => 'An email has been sent to your address.',
+ 'error' => 'The email address failed to be validated.',
+ 'ok' => 'The email address has been validated.',
+ 'unneccessary' => 'The email address was already validated.',
+ 'wrong_token' => 'The email address failed to be validated due to a wrong token.',
+ ),
+ 'need_to' => 'You need to validate your email address before being able to use %s.',
+ 'resend_email' => 'Resend the email',
+ 'title' => 'Email address validation',
+ ),
+ ),
+ 'mailer' => array(
+ 'email_need_validation' => array(
+ 'title' => 'You need to validate your account',
+ 'welcome' => 'Welcome %s,',
+ 'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:',
+ ),
+ ),
+);
diff --git a/app/i18n/es/admin.php b/app/i18n/es/admin.php
index 0ec8549bd..1af3bdcb2 100755
--- a/app/i18n/es/admin.php
+++ b/app/i18n/es/admin.php
@@ -159,6 +159,7 @@ return array(
'system' => array(
'_' => 'Configuración del sistema',
'auto-update-url' => 'URL de auto-actualización',
+ 'force_email_validation' => 'Force email addresses validation', //TODO - Translation
'instance-name' => 'Nombre de la fuente',
'max-categories' => 'Límite de categorías por usuario',
'max-feeds' => 'Límite de fuentes por usuario',
diff --git a/app/i18n/es/conf.php b/app/i18n/es/conf.php
index 2eeeee052..6aaad8d13 100755
--- a/app/i18n/es/conf.php
+++ b/app/i18n/es/conf.php
@@ -46,6 +46,7 @@ return array(
'_' => 'Borrar cuenta',
'warn' => 'Tu cuenta y todos los datos asociados serán eliminados.',
),
+ 'email' => 'Correo electrónico',
'password_api' => 'Contraseña API <br /><small>(para apps móviles, por ej.)</small>',
'password_form' => 'Contraseña<br /><small>(para el método de identificación por formulario web)</small>',
'password_format' => 'Mínimo de 7 caracteres',
diff --git a/app/i18n/es/gen.php b/app/i18n/es/gen.php
index 16c8267a6..e73aaef12 100755
--- a/app/i18n/es/gen.php
+++ b/app/i18n/es/gen.php
@@ -3,6 +3,7 @@
return array(
'action' => array(
'actualize' => 'Actualizar',
+ 'back' => '← Go back', //TODO - Translation
'back_to_rss_feeds' => '← regresar a tus fuentes RSS',
'cancel' => 'Cancelar',
'create' => 'Crear',
diff --git a/app/i18n/es/user.php b/app/i18n/es/user.php
new file mode 100644
index 000000000..4f2cfcda2
--- /dev/null
+++ b/app/i18n/es/user.php
@@ -0,0 +1,32 @@
+<?php
+
+return array(
+ 'email' => array(
+ 'feedback' => array(
+ 'invalid' => 'The email address is invalid.', //TODO - Translation
+ 'required' => 'The email address is required.', //TODO - Translation
+ ),
+ 'validation' => array(
+ 'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.', //TODO - Translation
+ 'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.', //TODO - Translation
+ 'feedback' => array(
+ 'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //TODO - Translation
+ 'email_sent' => 'An email has been sent to your address.', //TODO - Translation
+ 'error' => 'The email address failed to be validated.', //TODO - Translation
+ 'ok' => 'The email address has been validated.', //TODO - Translation
+ 'unneccessary' => 'The email address was already validated.', //TODO - Translation
+ 'wrong_token' => 'The email address failed to be validated due to a wrong token.', //TODO - Translation
+ ),
+ 'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
+ 'resend_email' => 'Resend the email', //TODO - Translation
+ 'title' => 'Email address validation', //TODO - Translation
+ ),
+ ),
+ 'mailer' => array(
+ 'email_need_validation' => array(
+ 'title' => 'You need to validate your account', //TODO - Translation
+ 'welcome' => 'Welcome %s,', //TODO - Translation
+ 'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+ ),
+ ),
+);
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index 74605b5ee..6002617fc 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -159,6 +159,7 @@ return array(
'system' => array(
'_' => 'Configuration du système',
'auto-update-url' => 'URL du service de mise à jour',
+ 'force_email_validation' => 'Forcer la validation des adresses email',
'instance-name' => 'Nom de l’instance',
'max-categories' => 'Limite de catégories par utilisateur',
'max-feeds' => 'Limite de flux par utilisateur',
diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php
index 5f6730b53..dcd623b5a 100644
--- a/app/i18n/fr/conf.php
+++ b/app/i18n/fr/conf.php
@@ -46,6 +46,7 @@ return array(
'_' => 'Suppression du compte',
'warn' => 'Le compte et toutes les données associées vont être supprimées.',
),
+ 'email' => 'Adresse email',
'password_api' => 'Mot de passe API<br /><small>(ex. : pour applis mobiles)</small>',
'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
'password_format' => '7 caractères minimum',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index d99e42fca..8e195c60d 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -3,6 +3,7 @@
return array(
'action' => array(
'actualize' => 'Actualiser',
+ 'back' => '← Retour',
'back_to_rss_feeds' => '← Retour à vos flux RSS',
'cancel' => 'Annuler',
'create' => 'Créer',
diff --git a/app/i18n/fr/user.php b/app/i18n/fr/user.php
new file mode 100644
index 000000000..01d3ad1af
--- /dev/null
+++ b/app/i18n/fr/user.php
@@ -0,0 +1,32 @@
+<?php
+
+return array(
+ 'email' => array(
+ 'feedback' => array(
+ 'invalid' => 'L’adresse email est invalide.',
+ 'required' => 'L’adresse email est requise.',
+ ),
+ 'validation' => array(
+ 'change_email' => 'Vous pouvez changer votre adresse email <a href="%s">dans votre profil</a>.',
+ 'email_sent_to' => 'Nous venons d’envoyer un email à <strong>%s</strong>, veuillez suivre ses indications pour valider votre adresse.',
+ 'feedback' => array(
+ 'email_failed' => 'Nous n’avons pas pu vous envoyer d’email à cause d’une mauvaise configuration du serveur.',
+ 'email_sent' => 'Un email a été envoyé à votre adresse.',
+ 'error' => 'L’adresse email n’a pas pu être validée.',
+ 'ok' => 'L’adresse email a été validée.',
+ 'unnecessary' => 'L’adresse email a déjà été validée.',
+ 'wrong_token' => 'L’adresse email n’a pas pu être validée à cause d’un mauvais token.',
+ ),
+ 'need_to' => 'Vous devez valider votre adresse email avant de pouvoir utiliser %s.',
+ 'resend_email' => 'Renvoyer l’email',
+ 'title' => 'Validation de l’adresse email',
+ ),
+ ),
+ 'mailer' => array(
+ 'email_need_validation' => array(
+ 'title' => 'Vous devez valider votre compte',
+ 'welcome' => 'Bienvenue %s,',
+ 'body' => 'Vous venez de vous inscrire sur %s mais vous devez encore valider votre adresse email. Pour cela, veuillez cliquer sur ce lien :',
+ ),
+ ),
+);
diff --git a/app/i18n/he/admin.php b/app/i18n/he/admin.php
index e0dfc405d..759b74e2a 100644
--- a/app/i18n/he/admin.php
+++ b/app/i18n/he/admin.php
@@ -163,6 +163,7 @@ return array(
'help' => 'in seconds', //TODO - Translation
'number' => 'Duration to keep logged in', //TODO - Translation
),
+ 'force_email_validation' => 'Force email addresses validation', //TODO - Translation
'instance-name' => 'Instance name', //TODO - Translation
'max-categories' => 'Categories per user limit', //TODO - Translation
'max-feeds' => 'Feeds per user limit', //TODO - Translation
diff --git a/app/i18n/he/conf.php b/app/i18n/he/conf.php
index 1da5c292c..7e764b944 100644
--- a/app/i18n/he/conf.php
+++ b/app/i18n/he/conf.php
@@ -46,6 +46,7 @@ return array(
'_' => 'Account deletion', //TODO - Translation
'warn' => 'Your account and all related data will be deleted.', //TODO - Translation
),
+ 'email' => 'Email address', //TODO - Translation
'password_api' => 'סיסמת API<br /><small>(לדוגמה ליישומים סלולריים)</small>',
'password_form' => 'סיסמה<br /><small>(לשימוש בטפוס ההרשמה)</small>',
'password_format' => 'At least 7 characters', //TODO - Translation
diff --git a/app/i18n/he/gen.php b/app/i18n/he/gen.php
index 13084fda0..270a66ea0 100644
--- a/app/i18n/he/gen.php
+++ b/app/i18n/he/gen.php
@@ -3,6 +3,7 @@
return array(
'action' => array(
'actualize' => 'מימוש',
+ 'back' => '← Go back', //TODO - Translation
'back_to_rss_feeds' => '← חזרה להזנות הRSS שלך',
'cancel' => 'ביטול',
'create' => 'יצירה',
diff --git a/app/i18n/he/user.php b/app/i18n/he/user.php
new file mode 100644
index 000000000..4f2cfcda2
--- /dev/null
+++ b/app/i18n/he/user.php
@@ -0,0 +1,32 @@
+<?php
+
+return array(
+ 'email' => array(
+ 'feedback' => array(
+ 'invalid' => 'The email address is invalid.', //TODO - Translation
+ 'required' => 'The email address is required.', //TODO - Translation
+ ),
+ 'validation' => array(
+ 'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.', //TODO - Translation
+ 'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.', //TODO - Translation
+ 'feedback' => array(
+ 'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //TODO - Translation
+ 'email_sent' => 'An email has been sent to your address.', //TODO - Translation
+ 'error' => 'The email address failed to be validated.', //TODO - Translation
+ 'ok' => 'The email address has been validated.', //TODO - Translation
+ 'unneccessary' => 'The email address was already validated.', //TODO - Translation
+ 'wrong_token' => 'The email address failed to be validated due to a wrong token.', //TODO - Translation
+ ),
+ 'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
+ 'resend_email' => 'Resend the email', //TODO - Translation
+ 'title' => 'Email address validation', //TODO - Translation
+ ),
+ ),
+ 'mailer' => array(
+ 'email_need_validation' => array(
+ 'title' => 'You need to validate your account', //TODO - Translation
+ 'welcome' => 'Welcome %s,', //TODO - Translation
+ 'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+ ),
+ ),
+);
diff --git a/app/i18n/it/admin.php b/app/i18n/it/admin.php
index d4253e9ba..8bb6c7bfe 100644
--- a/app/i18n/it/admin.php
+++ b/app/i18n/it/admin.php
@@ -159,6 +159,7 @@ return array(
'system' => array(
'_' => 'Configurazione di sistema',
'auto-update-url' => 'Auto-update server URL', //TODO - Translation
+ 'force_email_validation' => 'Force email addresses validation', //TODO - Translation
'instance-name' => 'Nome istanza',
'max-categories' => 'Limite categorie per utente',
'max-feeds' => 'Limite feeds per utente',
diff --git a/app/i18n/it/conf.php b/app/i18n/it/conf.php
index f3c59ed8c..f06302c72 100644
--- a/app/i18n/it/conf.php
+++ b/app/i18n/it/conf.php
@@ -46,6 +46,7 @@ return array(
'_' => 'Cancellazione account',
'warn' => 'Il tuo account e tutti i dati associati saranno cancellati.',
),
+ 'email' => 'Indirizzo email',
'password_api' => 'Password API<br /><small>(e.g., per applicazioni mobili)</small>',
'password_form' => 'Password<br /><small>(per il login classico)</small>',
'password_format' => 'Almeno 7 caratteri',
diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php
index 4f6f7e36f..e5114439c 100644
--- a/app/i18n/it/gen.php
+++ b/app/i18n/it/gen.php
@@ -3,6 +3,7 @@
return array(
'action' => array(
'actualize' => 'Aggiorna',
+ 'back' => '← Go back', //TODO - Translation
'back_to_rss_feeds' => '← Indietro',
'cancel' => 'Annulla',
'create' => 'Crea',
diff --git a/app/i18n/it/user.php b/app/i18n/it/user.php
new file mode 100644
index 000000000..4f2cfcda2
--- /dev/null
+++ b/app/i18n/it/user.php
@@ -0,0 +1,32 @@
+<?php
+
+return array(
+ 'email' => array(
+ 'feedback' => array(
+ 'invalid' => 'The email address is invalid.', //TODO - Translation
+ 'required' => 'The email address is required.', //TODO - Translation
+ ),
+ 'validation' => array(
+ 'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.', //TODO - Translation
+ 'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.', //TODO - Translation
+ 'feedback' => array(
+ 'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //TODO - Translation
+ 'email_sent' => 'An email has been sent to your address.', //TODO - Translation
+ 'error' => 'The email address failed to be validated.', //TODO - Translation
+ 'ok' => 'The email address has been validated.', //TODO - Translation
+ 'unneccessary' => 'The email address was already validated.', //TODO - Translation
+ 'wrong_token' => 'The email address failed to be validated due to a wrong token.', //TODO - Translation
+ ),
+ 'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
+ 'resend_email' => 'Resend the email', //TODO - Translation
+ 'title' => 'Email address validation', //TODO - Translation
+ ),
+ ),
+ 'mailer' => array(
+ 'email_need_validation' => array(
+ 'title' => 'You need to validate your account', //TODO - Translation
+ 'welcome' => 'Welcome %s,', //TODO - Translation
+ 'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+ ),
+ ),
+);
diff --git a/app/i18n/kr/admin.php b/app/i18n/kr/admin.php
index 6312bd3fe..4a8e425d5 100644
--- a/app/i18n/kr/admin.php
+++ b/app/i18n/kr/admin.php
@@ -159,6 +159,7 @@ return array(
'system' => array(
'_' => '시스템 설정',
'auto-update-url' => '자동 업데이트 서버 URL',
+ 'force_email_validation' => 'Force email addresses validation', //TODO - Translation
'instance-name' => '인스턴스 이름',
'max-categories' => '사용자별 카테고리 개수 제한',
'max-feeds' => '사용자별 피드 개수 제한',
diff --git a/app/i18n/kr/conf.php b/app/i18n/kr/conf.php
index 1efaee88b..397d57418 100644
--- a/app/i18n/kr/conf.php
+++ b/app/i18n/kr/conf.php
@@ -46,6 +46,7 @@ return array(
'_' => '계정 삭제',
'warn' => '당신의 계정과 관련된 모든 데이터가 삭제됩니다.',
),
+ 'email' => '메일 주소',
'password_api' => 'API 암호<br /><small>(예: 모바일 애플리케이션)</small>',
'password_form' => '암호<br /><small>(웹폼 로그인 방식 사용시)</small>',
'password_format' => '7 글자 이상이어야 합니다',
diff --git a/app/i18n/kr/gen.php b/app/i18n/kr/gen.php
index 72b95fa6e..979cb9ffa 100644
--- a/app/i18n/kr/gen.php
+++ b/app/i18n/kr/gen.php
@@ -3,6 +3,7 @@
return array(
'action' => array(
'actualize' => '새 글 가져오기',
+ 'back' => '← Go back', //TODO - Translation
'back_to_rss_feeds' => '← RSS 피드로 돌아가기',
'cancel' => '취소',
'create' => '생성',
diff --git a/app/i18n/kr/user.php b/app/i18n/kr/user.php
new file mode 100644
index 000000000..4f2cfcda2
--- /dev/null
+++ b/app/i18n/kr/user.php
@@ -0,0 +1,32 @@
+<?php
+
+return array(
+ 'email' => array(
+ 'feedback' => array(
+ 'invalid' => 'The email address is invalid.', //TODO - Translation
+ 'required' => 'The email address is required.', //TODO - Translation
+ ),
+ 'validation' => array(
+ 'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.', //TODO - Translation
+ 'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.', //TODO - Translation
+ 'feedback' => array(
+ 'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //TODO - Translation
+ 'email_sent' => 'An email has been sent to your address.', //TODO - Translation
+ 'error' => 'The email address failed to be validated.', //TODO - Translation
+ 'ok' => 'The email address has been validated.', //TODO - Translation
+ 'unneccessary' => 'The email address was already validated.', //TODO - Translation
+ 'wrong_token' => 'The email address failed to be validated due to a wrong token.', //TODO - Translation
+ ),
+ 'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
+ 'resend_email' => 'Resend the email', //TODO - Translation
+ 'title' => 'Email address validation', //TODO - Translation
+ ),
+ ),
+ 'mailer' => array(
+ 'email_need_validation' => array(
+ 'title' => 'You need to validate your account', //TODO - Translation
+ 'welcome' => 'Welcome %s,', //TODO - Translation
+ 'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+ ),
+ ),
+);
diff --git a/app/i18n/nl/admin.php b/app/i18n/nl/admin.php
index e5d126eb8..535241e58 100644
--- a/app/i18n/nl/admin.php
+++ b/app/i18n/nl/admin.php
@@ -159,6 +159,7 @@ return array(
'system' => array(
'_' => 'Systeem configuratie',
'auto-update-url' => 'Automatische update server URL',
+ 'force_email_validation' => 'Force email addresses validation', //TODO - Translation
'instance-name' => 'Voorbeeld naam',
'max-categories' => 'Categorielimiet per gebruiker',
'max-feeds' => 'Feedlimiet per gebruiker',
diff --git a/app/i18n/nl/conf.php b/app/i18n/nl/conf.php
index b7ba7bbeb..ec219d051 100644
--- a/app/i18n/nl/conf.php
+++ b/app/i18n/nl/conf.php
@@ -46,6 +46,7 @@ return array(
'_' => 'Account verwijderen',
'warn' => 'Uw account en alle gerelateerde gegvens worden verwijderd.',
),
+ 'email' => 'Email adres',
'password_api' => 'Wachtwoord API<br /><small>(e.g., voor mobiele apps)</small>',
'password_form' => 'Wachtwoord<br /><small>(voor de Web-formulier log in methode)</small>',
'password_format' => 'Ten minste 7 tekens',
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index 57d68d673..419d8b36c 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -3,6 +3,7 @@
return array(
'action' => array(
'actualize' => 'Actualiseren',
+ 'back' => '← Go back', //TODO - Translation
'back_to_rss_feeds' => '← Ga terug naar je RSS feeds',
'cancel' => 'Annuleren',
'create' => 'Opslaan',
diff --git a/app/i18n/nl/user.php b/app/i18n/nl/user.php
new file mode 100644
index 000000000..4f2cfcda2
--- /dev/null
+++ b/app/i18n/nl/user.php
@@ -0,0 +1,32 @@
+<?php
+
+return array(
+ 'email' => array(
+ 'feedback' => array(
+ 'invalid' => 'The email address is invalid.', //TODO - Translation
+ 'required' => 'The email address is required.', //TODO - Translation
+ ),
+ 'validation' => array(
+ 'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.', //TODO - Translation
+ 'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.', //TODO - Translation
+ 'feedback' => array(
+ 'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //TODO - Translation
+ 'email_sent' => 'An email has been sent to your address.', //TODO - Translation
+ 'error' => 'The email address failed to be validated.', //TODO - Translation
+ 'ok' => 'The email address has been validated.', //TODO - Translation
+ 'unneccessary' => 'The email address was already validated.', //TODO - Translation
+ 'wrong_token' => 'The email address failed to be validated due to a wrong token.', //TODO - Translation
+ ),
+ 'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
+ 'resend_email' => 'Resend the email', //TODO - Translation
+ 'title' => 'Email address validation', //TODO - Translation
+ ),
+ ),
+ 'mailer' => array(
+ 'email_need_validation' => array(
+ 'title' => 'You need to validate your account', //TODO - Translation
+ 'welcome' => 'Welcome %s,', //TODO - Translation
+ 'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+ ),
+ ),
+);
diff --git a/app/i18n/oc/admin.php b/app/i18n/oc/admin.php
index 2f8ede873..aee12a20d 100644
--- a/app/i18n/oc/admin.php
+++ b/app/i18n/oc/admin.php
@@ -163,6 +163,7 @@ return array(
'help' => 'en segondas',
'number' => 'Durada de téner d’ésser connectat',
),
+ 'force_email_validation' => 'Force email addresses validation', //TODO - Translation
'instance-name' => 'Nom de l’instància',
'max-categories' => 'Limita de categoria per utilizaire',
'max-feeds' => 'Limita de fluxes per utilizaire',
diff --git a/app/i18n/oc/conf.php b/app/i18n/oc/conf.php
index b37785a7e..19880b3f8 100644
--- a/app/i18n/oc/conf.php
+++ b/app/i18n/oc/conf.php
@@ -46,6 +46,7 @@ return array(
'_' => 'Supression del compte',
'warn' => 'Lo compte e totas las donadas ligadas seràn suprimits.',
),
+ 'email' => 'Adreça de corrièl',
'password_api' => 'Senhal API<br /><small>(ex. : per las aplicacions mobil)</small>',
'password_form' => 'Senhal API<br /><small>(ex. : per la connexion via formulari)</small>',
'password_format' => 'Almens 7 caractèrs',
diff --git a/app/i18n/oc/gen.php b/app/i18n/oc/gen.php
index 1fa1358ff..281bb06f1 100644
--- a/app/i18n/oc/gen.php
+++ b/app/i18n/oc/gen.php
@@ -3,6 +3,7 @@
return array(
'action' => array(
'actualize' => 'Actualizar',
+ 'back' => '← Go back', //TODO - Translation
'back_to_rss_feeds' => '← Tornar a vòstres fluxes RSS',
'cancel' => 'Anullar',
'create' => 'Crear',
diff --git a/app/i18n/oc/user.php b/app/i18n/oc/user.php
new file mode 100644
index 000000000..4f2cfcda2
--- /dev/null
+++ b/app/i18n/oc/user.php
@@ -0,0 +1,32 @@
+<?php
+
+return array(
+ 'email' => array(
+ 'feedback' => array(
+ 'invalid' => 'The email address is invalid.', //TODO - Translation
+ 'required' => 'The email address is required.', //TODO - Translation
+ ),
+ 'validation' => array(
+ 'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.', //TODO - Translation
+ 'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.', //TODO - Translation
+ 'feedback' => array(
+ 'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //TODO - Translation
+ 'email_sent' => 'An email has been sent to your address.', //TODO - Translation
+ 'error' => 'The email address failed to be validated.', //TODO - Translation
+ 'ok' => 'The email address has been validated.', //TODO - Translation
+ 'unneccessary' => 'The email address was already validated.', //TODO - Translation
+ 'wrong_token' => 'The email address failed to be validated due to a wrong token.', //TODO - Translation
+ ),
+ 'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
+ 'resend_email' => 'Resend the email', //TODO - Translation
+ 'title' => 'Email address validation', //TODO - Translation
+ ),
+ ),
+ 'mailer' => array(
+ 'email_need_validation' => array(
+ 'title' => 'You need to validate your account', //TODO - Translation
+ 'welcome' => 'Welcome %s,', //TODO - Translation
+ 'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+ ),
+ ),
+);
diff --git a/app/i18n/pt-br/admin.php b/app/i18n/pt-br/admin.php
index 82559c67b..cef6694c2 100644
--- a/app/i18n/pt-br/admin.php
+++ b/app/i18n/pt-br/admin.php
@@ -159,6 +159,7 @@ return array(
'system' => array(
'_' => 'Configuração do sistema',
'auto-update-url' => 'URL do servidor para atualização automática',
+ 'force_email_validation' => 'Force email addresses validation', //TODO - Translation
'instance-name' => 'Nome da instância',
'max-categories' => 'Limite de categorias por usuário',
'max-feeds' => 'Limite de Feeds por usuário',
diff --git a/app/i18n/pt-br/conf.php b/app/i18n/pt-br/conf.php
index 082027328..eb067e58a 100644
--- a/app/i18n/pt-br/conf.php
+++ b/app/i18n/pt-br/conf.php
@@ -46,6 +46,7 @@ return array(
'_' => 'Remover conta',
'warn' => 'Sua conta e todos os dados relacionados serão removidos.',
),
+ 'email' => 'Endereço de e-mail',
'password_api' => 'Senha da API<br /><small>(p.s., para aplicativos móveis)</small>',
'password_form' => 'Senha<br /><small>(para o método de formulário web)</small>',
'password_format' => 'Ao menos 7 caracteres',
diff --git a/app/i18n/pt-br/gen.php b/app/i18n/pt-br/gen.php
index 2d2b5f1a4..e536e1d95 100644
--- a/app/i18n/pt-br/gen.php
+++ b/app/i18n/pt-br/gen.php
@@ -3,6 +3,7 @@
return array(
'action' => array(
'actualize' => 'Atualizar',
+ 'back' => '← Go back', //TODO - Translation
'back_to_rss_feeds' => '← Volte para o seu feeds RSS',
'cancel' => 'Cancelar',
'create' => 'Criar',
diff --git a/app/i18n/pt-br/user.php b/app/i18n/pt-br/user.php
new file mode 100644
index 000000000..4f2cfcda2
--- /dev/null
+++ b/app/i18n/pt-br/user.php
@@ -0,0 +1,32 @@
+<?php
+
+return array(
+ 'email' => array(
+ 'feedback' => array(
+ 'invalid' => 'The email address is invalid.', //TODO - Translation
+ 'required' => 'The email address is required.', //TODO - Translation
+ ),
+ 'validation' => array(
+ 'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.', //TODO - Translation
+ 'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.', //TODO - Translation
+ 'feedback' => array(
+ 'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //TODO - Translation
+ 'email_sent' => 'An email has been sent to your address.', //TODO - Translation
+ 'error' => 'The email address failed to be validated.', //TODO - Translation
+ 'ok' => 'The email address has been validated.', //TODO - Translation
+ 'unneccessary' => 'The email address was already validated.', //TODO - Translation
+ 'wrong_token' => 'The email address failed to be validated due to a wrong token.', //TODO - Translation
+ ),
+ 'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
+ 'resend_email' => 'Resend the email', //TODO - Translation
+ 'title' => 'Email address validation', //TODO - Translation
+ ),
+ ),
+ 'mailer' => array(
+ 'email_need_validation' => array(
+ 'title' => 'You need to validate your account', //TODO - Translation
+ 'welcome' => 'Welcome %s,', //TODO - Translation
+ 'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+ ),
+ ),
+);
diff --git a/app/i18n/ru/admin.php b/app/i18n/ru/admin.php
index c9a7d6683..adf091df9 100644
--- a/app/i18n/ru/admin.php
+++ b/app/i18n/ru/admin.php
@@ -159,6 +159,7 @@ return array(
'system' => array(
'_' => 'Системные настройки',
'auto-update-url' => 'Адрес сервера для автоматического обновления',
+ 'force_email_validation' => 'Force email addresses validation', //TODO - Translation
'instance-name' => 'Название этого сервера',
'max-categories' => 'Количество категорий на пользователя',
'max-feeds' => 'Количество статей на пользователя',
diff --git a/app/i18n/ru/conf.php b/app/i18n/ru/conf.php
index 48ce4b9f3..af6f3b5f6 100644
--- a/app/i18n/ru/conf.php
+++ b/app/i18n/ru/conf.php
@@ -46,6 +46,7 @@ return array(
'_' => 'Account deletion', //TODO - Translation
'warn' => 'Your account and all the related data will be deleted.', //TODO - Translation
),
+ 'email' => 'Email address', //TODO - Translation
'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>', //TODO - Translation
'password_form' => 'Password<br /><small>(for the Web-form login method)</small>', //TODO - Translation
'password_format' => 'At least 7 characters', //TODO - Translation
diff --git a/app/i18n/ru/gen.php b/app/i18n/ru/gen.php
index f28e5adad..39f3c7534 100644
--- a/app/i18n/ru/gen.php
+++ b/app/i18n/ru/gen.php
@@ -3,6 +3,7 @@
return array(
'action' => array(
'actualize' => 'Actualize', //TODO - Translation
+ 'back' => '← Go back', //TODO - Translation
'back_to_rss_feeds' => '← Go back to your RSS feeds', //TODO - Translation
'cancel' => 'Cancel', //TODO - Translation
'create' => 'Create', //TODO - Translation
diff --git a/app/i18n/ru/user.php b/app/i18n/ru/user.php
new file mode 100644
index 000000000..4f2cfcda2
--- /dev/null
+++ b/app/i18n/ru/user.php
@@ -0,0 +1,32 @@
+<?php
+
+return array(
+ 'email' => array(
+ 'feedback' => array(
+ 'invalid' => 'The email address is invalid.', //TODO - Translation
+ 'required' => 'The email address is required.', //TODO - Translation
+ ),
+ 'validation' => array(
+ 'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.', //TODO - Translation
+ 'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.', //TODO - Translation
+ 'feedback' => array(
+ 'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //TODO - Translation
+ 'email_sent' => 'An email has been sent to your address.', //TODO - Translation
+ 'error' => 'The email address failed to be validated.', //TODO - Translation
+ 'ok' => 'The email address has been validated.', //TODO - Translation
+ 'unneccessary' => 'The email address was already validated.', //TODO - Translation
+ 'wrong_token' => 'The email address failed to be validated due to a wrong token.', //TODO - Translation
+ ),
+ 'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
+ 'resend_email' => 'Resend the email', //TODO - Translation
+ 'title' => 'Email address validation', //TODO - Translation
+ ),
+ ),
+ 'mailer' => array(
+ 'email_need_validation' => array(
+ 'title' => 'You need to validate your account', //TODO - Translation
+ 'welcome' => 'Welcome %s,', //TODO - Translation
+ 'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+ ),
+ ),
+);
diff --git a/app/i18n/tr/admin.php b/app/i18n/tr/admin.php
index b1d6671ca..2c7d0fd6d 100644
--- a/app/i18n/tr/admin.php
+++ b/app/i18n/tr/admin.php
@@ -159,6 +159,7 @@ return array(
'system' => array(
'_' => 'Sistem yapılandırması',
'auto-update-url' => 'Otomatik güncelleme sunucu URL',
+ 'force_email_validation' => 'Force email addresses validation', //TODO - Translation
'instance-name' => 'Örnek isim',
'max-categories' => 'Kullanıcı başına kategori limiti',
'max-feeds' => 'Kullanıcı başına akış limiti',
diff --git a/app/i18n/tr/conf.php b/app/i18n/tr/conf.php
index 855bca6c8..2bf1e8a6a 100644
--- a/app/i18n/tr/conf.php
+++ b/app/i18n/tr/conf.php
@@ -46,6 +46,7 @@ return array(
'_' => 'Hesap silme',
'warn' => 'Hesabınız ve tüm verileriniz silinecek.',
),
+ 'email' => 'Email adresleri',
'password_api' => 'API Şifresi<br /><small>(ör. mobil uygulamalar için)</small>',
'password_form' => 'Şifre<br /><small>(Tarayıcı girişi için)</small>',
'password_format' => 'En az 7 karakter',
diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php
index e167f5a09..8bac03746 100644
--- a/app/i18n/tr/gen.php
+++ b/app/i18n/tr/gen.php
@@ -3,6 +3,7 @@
return array(
'action' => array(
'actualize' => 'Yenile',
+ 'back' => '← Go back', //TODO - Translation
'back_to_rss_feeds' => '← RSS akışlarınız için geri gidin',
'cancel' => 'İptal',
'create' => 'Oluştur',
diff --git a/app/i18n/tr/user.php b/app/i18n/tr/user.php
new file mode 100644
index 000000000..4f2cfcda2
--- /dev/null
+++ b/app/i18n/tr/user.php
@@ -0,0 +1,32 @@
+<?php
+
+return array(
+ 'email' => array(
+ 'feedback' => array(
+ 'invalid' => 'The email address is invalid.', //TODO - Translation
+ 'required' => 'The email address is required.', //TODO - Translation
+ ),
+ 'validation' => array(
+ 'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.', //TODO - Translation
+ 'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.', //TODO - Translation
+ 'feedback' => array(
+ 'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //TODO - Translation
+ 'email_sent' => 'An email has been sent to your address.', //TODO - Translation
+ 'error' => 'The email address failed to be validated.', //TODO - Translation
+ 'ok' => 'The email address has been validated.', //TODO - Translation
+ 'unneccessary' => 'The email address was already validated.', //TODO - Translation
+ 'wrong_token' => 'The email address failed to be validated due to a wrong token.', //TODO - Translation
+ ),
+ 'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
+ 'resend_email' => 'Resend the email', //TODO - Translation
+ 'title' => 'Email address validation', //TODO - Translation
+ ),
+ ),
+ 'mailer' => array(
+ 'email_need_validation' => array(
+ 'title' => 'You need to validate your account', //TODO - Translation
+ 'welcome' => 'Welcome %s,', //TODO - Translation
+ 'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+ ),
+ ),
+);
diff --git a/app/i18n/zh-cn/admin.php b/app/i18n/zh-cn/admin.php
index 74f57b6e8..cdc8449a3 100644
--- a/app/i18n/zh-cn/admin.php
+++ b/app/i18n/zh-cn/admin.php
@@ -159,6 +159,7 @@ return array(
'system' => array(
'_' => '系统配置',
'auto-update-url' => '自动升级服务器 URL',
+ 'force_email_validation' => 'Force email addresses validation', //TODO - Translation
'instance-name' => '实例名称',
'max-categories' => '每用户分类限制',
'max-feeds' => '每用户 RSS 源限制',
diff --git a/app/i18n/zh-cn/conf.php b/app/i18n/zh-cn/conf.php
index ebe069c2c..2960cd6b1 100644
--- a/app/i18n/zh-cn/conf.php
+++ b/app/i18n/zh-cn/conf.php
@@ -46,6 +46,7 @@ return array(
'_' => '账户删除',
'warn' => '你的帐户和所有相关数据都将被删除。',
),
+ 'email' => 'Email 地址',
'password_api' => 'API 密码<br /><small>(例如,用于手机 APP)</small>',
'password_form' => '密码<br /><small>(用于 Web-form 登录方式)</small>',
'password_format' => '至少 7 个字符',
diff --git a/app/i18n/zh-cn/gen.php b/app/i18n/zh-cn/gen.php
index bef5744b6..4d4c52ed6 100644
--- a/app/i18n/zh-cn/gen.php
+++ b/app/i18n/zh-cn/gen.php
@@ -3,6 +3,7 @@
return array(
'action' => array(
'actualize' => '获取',
+ 'back' => '← Go back', //TODO - Translation
'back_to_rss_feeds' => '← 返回',
'cancel' => '取消',
'create' => '创建',
diff --git a/app/i18n/zh-cn/user.php b/app/i18n/zh-cn/user.php
new file mode 100644
index 000000000..4f2cfcda2
--- /dev/null
+++ b/app/i18n/zh-cn/user.php
@@ -0,0 +1,32 @@
+<?php
+
+return array(
+ 'email' => array(
+ 'feedback' => array(
+ 'invalid' => 'The email address is invalid.', //TODO - Translation
+ 'required' => 'The email address is required.', //TODO - Translation
+ ),
+ 'validation' => array(
+ 'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.', //TODO - Translation
+ 'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.', //TODO - Translation
+ 'feedback' => array(
+ 'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //TODO - Translation
+ 'email_sent' => 'An email has been sent to your address.', //TODO - Translation
+ 'error' => 'The email address failed to be validated.', //TODO - Translation
+ 'ok' => 'The email address has been validated.', //TODO - Translation
+ 'unneccessary' => 'The email address was already validated.', //TODO - Translation
+ 'wrong_token' => 'The email address failed to be validated due to a wrong token.', //TODO - Translation
+ ),
+ 'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
+ 'resend_email' => 'Resend the email', //TODO - Translation
+ 'title' => 'Email address validation', //TODO - Translation
+ ),
+ ),
+ 'mailer' => array(
+ 'email_need_validation' => array(
+ 'title' => 'You need to validate your account', //TODO - Translation
+ 'welcome' => 'Welcome %s,', //TODO - Translation
+ 'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+ ),
+ ),
+);