summaryrefslogtreecommitdiff
path: root/app/i18n
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2014-10-26 12:22:13 +0100
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2014-10-26 12:22:13 +0100
commit5d6407a0bf0ecee7017f9d6c6c110b7afa98fff0 (patch)
tree493652d2de8db143e111e1c7b1c7627c2e68fa55 /app/i18n
parent20b40aa85ea23e00e71e9d7ab8f3b08b51f16f41 (diff)
Update i18n
- Fix i18n strings - Fix typo profil -> profile See https://github.com/marienfressinaud/FreshRSS/issues/678
Diffstat (limited to 'app/i18n')
-rw-r--r--app/i18n/en.php16
-rw-r--r--app/i18n/fr.php16
2 files changed, 22 insertions, 10 deletions
diff --git a/app/i18n/en.php b/app/i18n/en.php
index a3593b28c..275471e19 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -196,6 +196,10 @@
'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y',
'february' => 'Feb',
'feed' => 'Feed',
+ 'feedback.login.error' => 'Login is invalid',
+ 'feedback.login.success' => 'You are connected',
+ 'feedback.logout.success' => 'You are disconnected',
+ 'feedback.user_profile.updated' => 'Your profile has been modified',
'feeds' => 'Feeds',
'feeds_actualized' => 'RSS feeds have been updated',
'feeds_imported' => 'Your feeds have been imported and will now be updated',
@@ -233,10 +237,12 @@
'gen.menu.admin' => 'Administration',
'gen.menu.authentication' => 'Authentication',
'gen.menu.check_install' => 'Installation checking',
- 'gen.menu.manage_users' => 'Manage users',
- 'gen.menu.profil' => 'Profil',
+ 'gen.menu.user_management' => 'Manage users',
+ 'gen.menu.user_profile' => 'Profile',
'gen.title.check_install' => 'Installation checking',
'gen.title.global_view' => 'Global view',
+ 'gen.title.user_management' => 'Manage users',
+ 'gen.title.user_profile' => 'Profile',
'general_configuration' => 'General configuration',
'general_conf_is_ok' => 'General configuration has been saved.',
'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">on Github</a> or <a href="mailto:dev@marienfressinaud.fr">by mail</a>',
@@ -262,8 +268,8 @@
'invalid_login' => 'Login is invalid',
'invalid_url' => 'URL <em>%s</em> is invalid',
'is_admin' => 'is administrator',
- 'jan' => 'jan',
'Jan' => '\\J\\a\\n\\u\\a\\r\\y',
+ 'jan' => 'jan',
'january' => 'Jan',
'javascript_for_shortcuts' => 'JavaScript must be enabled in order to use shortcuts',
'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
@@ -272,8 +278,8 @@
'Jul' => '\\J\\u\\l\\y',
'july' => 'Jul',
'jump_next' => 'jump to next unread sibling (feed or category)',
- 'jun' => 'jun',
'Jun' => '\\J\\u\\n\\e',
+ 'jun' => 'jun',
'june' => 'Jun',
'keep_history' => 'Minimum number of articles to keep',
'keep_logged_in' => 'Keep me logged in <small>(1 month)</small>',
@@ -329,8 +335,8 @@
'not_read' => '%d unread',
'not_reads' => '%d unread',
'not_yet_implemented' => 'Not yet implemented',
- 'nov' => 'nov',
'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
+ 'nov' => 'nov',
'november' => 'Nov',
'no_feed_actualized' => 'No RSS feed has been updated',
'no_feed_to_display' => 'There is no article to show.',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 60b7a4682..e3a49d54c 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -196,6 +196,10 @@
'Feb' => '\\f\\é\\v\\r\\i\\e\\r',
'february' => 'février',
'feed' => 'Flux',
+ 'feedback.login.error' => 'L’identifiant est invalide !',
+ 'feedback.login.success' => 'Vous êtes désormais connecté',
+ 'feedback.logout.success' => 'Vous avez été déconnecté',
+ 'feedback.user_profile.updated' => 'Votre profil a été mis à jour',
'feeds' => 'Flux',
'feeds_actualized' => 'Les flux ont été mis à jour.',
'feeds_imported' => 'Vos flux ont été importés et vont maintenant être actualisés.',
@@ -233,10 +237,12 @@
'gen.menu.admin' => 'Administration',
'gen.menu.authentication' => 'Authentification',
'gen.menu.check_install' => 'Vérification de l\'installation',
- 'gen.menu.manage_users' => 'Gestion des utilisateurs',
- 'gen.menu.profil' => 'Profil',
+ 'gen.menu.user_management' => 'Gestion des utilisateurs',
+ 'gen.menu.user_profile' => 'Profil',
'gen.title.check_install' => 'Vérification de l\'installation',
'gen.title.global_view' => 'Vue globale',
+ 'gen.title.user_management' => 'Gestion des utilisateurs',
+ 'gen.title.user_profile' => 'Profil',
'general_configuration' => 'Configuration générale',
'general_conf_is_ok' => 'La configuration générale a été enregistrée.',
'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">sur Github</a> ou <a href="mailto:dev@marienfressinaud.fr">par courriel</a>',
@@ -262,8 +268,8 @@
'invalid_login' => 'L’identifiant est invalide !',
'invalid_url' => 'L’url <em>%s</em> est invalide.',
'is_admin' => 'est administrateur',
- 'jan' => 'jan.',
'Jan' => '\\j\\a\\n\\v\\i\\e\\r',
+ 'jan' => 'jan.',
'january' => 'janvier',
'javascript_for_shortcuts' => 'Le JavaScript doit être activé pour pouvoir profiter des raccourcis.',
'javascript_is_better' => 'FreshRSS est plus agréable à utiliser avec JavaScript activé',
@@ -272,8 +278,8 @@
'Jul' => '\\j\\u\\i\\l\\l\\e\\t',
'july' => 'juillet',
'jump_next' => 'sauter au prochain voisin non lu (flux ou catégorie)',
- 'jun' => 'juin',
'Jun' => '\\j\\u\\i\\n',
+ 'jun' => 'juin',
'june' => 'juin',
'keep_history' => 'Nombre minimum d’articles à conserver',
'keep_logged_in' => 'Rester connecté <small>(1 mois)</small>',
@@ -329,8 +335,8 @@
'not_read' => '%d non lu',
'not_reads' => '%d non lus',
'not_yet_implemented' => 'Pas encore implémenté',
- 'nov' => 'nov.',
'Nov' => '\\n\\o\\v\\e\\m\\b\\r\\e',
+ 'nov' => 'nov.',
'november' => 'novembre',
'no_feed_actualized' => 'Aucun flux n’a pu être mis à jour.',
'no_feed_to_display' => 'Il n’y a aucun article à afficher.',