Update i18n

- Fix i18n strings
- Fix typo profil -> profile

See https://github.com/marienfressinaud/FreshRSS/issues/678

7 files changed, 39 insertions, 27 deletions

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 4af39cb71..a08f906e3 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -143,7 +143,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 				}
 
 				// All is good, go back to the index.
-				Minz_Request::good(_t('login'),
+				Minz_Request::good(_t('feedback.login.success'),
 				                   array('c' => 'index', 'a' => 'index'));
 			} else {
 				Minz_Log::warning('Password mismatch for' .
@@ -182,7 +182,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 				Minz_Session::_param('passwordHash', $s);
 				FreshRSS_Auth::giveAccess();
 
-				Minz_Request::good(_t('login'),
+				Minz_Request::good(_t('feedback.login.success'),
 				                   array('c' => 'index', 'a' => 'index'));
 			} else {
 				Minz_Log::warning('Unsafe password mismatch for user ' . $username);
@@ -274,7 +274,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 	public function logoutAction() {
 		invalidateHttpCache();
 		FreshRSS_Auth::removeAccess();
-		Minz_Request::good(_t('disconnected'),
+		Minz_Request::good(_t('feedback.logout.success'),
 		                   array('c' => 'index', 'a' => 'index'));
 	}
 
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 61d33437d..2343520ca 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -23,10 +23,10 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 	}
 
 	/**
-	 * This action displays the user profil page.
+	 * This action displays the user profile page.
 	 */
-	public function profilAction() {
-		Minz_View::prependTitle(_t('users.profil') . ' · ');
+	public function profileAction() {
+		Minz_View::prependTitle(_t('gen.title.user_profile') . ' · ');
 
 		if (Minz_Request::isPost()) {
 			$ok = true;
@@ -74,11 +74,11 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 			}
 
 			if ($ok) {
-				Minz_Request::good('users.profil.updated',
-				                   array('c' => 'user', 'a' => 'profil'));
+				Minz_Request::good(_t('feedback.user_profile.updated'),
+				                   array('c' => 'user', 'a' => 'profile'));
 			} else {
-				Minz_Request::bad('error_occurred',
-				                  array('c' => 'user', 'a' => 'profil'));
+				Minz_Request::bad(_t('error_occurred'),
+				                  array('c' => 'user', 'a' => 'profile'));
 			}
 		}
 	}
@@ -92,7 +92,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 			                  array('error' => array(_t('access_denied'))));
 		}
 
-		Minz_View::prependTitle(_t('users.manage') . ' · ');
+		Minz_View::prependTitle(_t('gen.title.user_management') . ' · ');
 
 		// Get the correct current user.
 		$userDAO = new FreshRSS_UserDAO();
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.',
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 32dc19a4e..53c52d3e3 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -19,14 +19,14 @@
 		<a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('queries'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::controllerName() === 'user' &&
-	                          Minz_Request::actionName() === 'profil'? ' active' : ''; ?>">
-		<a href="<?php echo _url('user', 'profil'); ?>"><?php echo _t('gen.menu.profil'); ?></a>
+	                          Minz_Request::actionName() === 'profile'? ' active' : ''; ?>">
+		<a href="<?php echo _url('user', 'profile'); ?>"><?php echo _t('gen.menu.user_profile'); ?></a>
 	</li>
 	<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
 	<li class="nav-header"><?php echo _t('gen.menu.admin'); ?></li>
 	<li class="item<?php echo Minz_Request::controllerName() === 'user' &&
 	                          Minz_Request::actionName() === 'manage' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('gen.menu.manage_users'); ?></a>
+		<a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('gen.menu.user_management'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::controllerName() === 'auth' ? ' active' : ''; ?>">
 		<a href="<?php echo _url('auth', 'index'); ?>"><?php echo _t('gen.menu.authentication'); ?></a>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 506cec175..c73d9cdbb 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -62,11 +62,11 @@ if (Minz_Configuration::canLogIn()) {
 				<li class="item"><a href="<?php echo _url('configure', 'sharing'); ?>"><?php echo _t('sharing'); ?></a></li>
 				<li class="item"><a href="<?php echo _url('configure', 'shortcut'); ?>"><?php echo _t('shortcuts'); ?></a></li>
 				<li class="item"><a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('queries'); ?></a></li>
-				<li class="item"><a href="<?php echo _url('user', 'profil'); ?>"><?php echo _t('gen.menu.profil'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('user', 'profile'); ?>"><?php echo _t('gen.menu.user_profile'); ?></a></li>
 				<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
 				<li class="separator"></li>
 				<li class="dropdown-header"><?php echo _t('gen.menu.admin'); ?></li>
-				<li class="item"><a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('gen.menu.manage_users'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('gen.menu.user_management'); ?></a></li>
 				<li class="item"><a href="<?php echo _url('auth', 'index'); ?>"><?php echo _t('gen.menu.authentication'); ?></a></li>
 				<li class="item"><a href="<?php echo _url('update', 'checkInstall'); ?>"><?php echo _t('gen.menu.check_install'); ?></a></li>
 				<li class="item"><a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('update'); ?></a></li>
diff --git a/app/views/user/profil.phtml b/app/views/user/profile.phtml
index a2af53c96..60257012c 100644
--- a/app/views/user/profil.phtml
+++ b/app/views/user/profile.phtml
@@ -3,7 +3,7 @@
 <div class="post">
 	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
-	<form method="post" action="<?php echo _url('user', 'profil'); ?>">
+	<form method="post" action="<?php echo _url('user', 'profile'); ?>">
 		<legend><?php echo _t('login_configuration'); ?></legend>
 
 		<div class="form-group">