Fix i18n for update and user controllers

4 files changed, 28 insertions, 16 deletions

diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 05077cf66..7778c56a7 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -81,6 +81,7 @@ return array(
 			'nok' => 'There is one or more lacking tables in the database.',
 			'ok' => 'Tables are existing in the database.',
 		),
+		'title' => 'Installation checking',
 		'tokens' => array(
 			'nok' => 'Check permissions on <em>./data/tokens</em> directory. HTTP server must have rights to write into',
 			'ok' => 'Permissions on tokens directory are good.',
@@ -122,7 +123,11 @@ return array(
 		'title' => 'Statistics',
 		'top_feed' => 'Top ten feeds',
 	),
+	'update' => array(
+		'title' => 'Update system',
+	),
 	'users' => array(
 		'articles_and_size' => '%s articles (%s)',
+		'title' => 'Manage users',
 	),
 );
diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index 0a1aa9f8e..09f9fa9ce 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -11,6 +11,9 @@ return array(
 		'number' => 'Query n°%d',
 		'title' => 'User queries',
 	),
+	'profile' => array(
+		'title' => 'Profile',
+	),
 	'reading' => array(
 		'title' => 'Reading',
 	),
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index 0dcbbe44d..192a33fcf 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -70,7 +70,26 @@ return array(
 		),
 		'purge_completed' => 'Purge completed (%d articles deleted)',
 	),
-	'user_profile' => array(
+	'update' => array(
+		'can_apply' => 'An update is available.',
+		'error' => 'The update process has encountered an error: %s',
+		'file_is_nok' => 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into',
+		'finished' => 'Update completed!',
+		'none' => 'No update to apply',
+		'server_not_found' => 'Update server cannot be found. [%s]',
+	),
+	'user' => array(
+		'created' => array(
+			'_' => 'User %s has been created',
+			'error' => 'User %s cannot be created',
+		),
+		'deleted' => array(
+			'_' => 'User %s has been deleted',
+			'error' => 'User %s cannot be deleted',
+		),
+	),
+	'profile' => array(
+		'error' => 'Your profile cannot be modified',
 		'updated' => 'Your profile has been modified',
 	),
 );
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 2a858d6a6..761d566bf 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -123,12 +123,6 @@ return array(
 		'or' => 'or',
 		'yes' => 'Yes',
 	),
-	'title' => array(
-		'authentication' => 'Authentication',
-		'check_install' => 'Installation checking',
-		'user_management' => 'Manage users',
-		'user_profile' => 'Profile',
-	),
 	'freshrss' => 'FreshRSS',
 	'activate_sharing' => 'Activate sharing',
 	'after_onread' => 'After “mark all as read”,',
@@ -203,7 +197,6 @@ return array(
 	'favicons_is_ok' => 'Permissions on favicons directory are good',
 	'feed' => 'Feed',
 	'feeds' => 'Feeds',
-	'file_is_nok' => 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into',
 	'finish_installation' => 'Complete installation',
 	'first_article' => 'Skip to the first article',
 	'fix_errors_before' => 'Fix errors before skip to the next step.',
@@ -250,7 +243,6 @@ return array(
 	'no_query_filter' => 'No filter',
 	'no_rss_feed' => 'No RSS feed',
 	'no_selected_feed' => 'No feed selected.',
-	'no_update' => 'No update to apply',
 	'not_read' => '%d unread',
 	'not_reads' => '%d unread',
 	'not_yet_implemented' => 'Not yet implemented',
@@ -323,20 +315,13 @@ return array(
 	'top_line' => 'Top line',
 	'unsafe_autologin' => 'Allow unsafe automatic login using the format: ',
 	'update_apply' => 'Apply',
-	'update_can_apply' => 'An update is available.',
 	'update_check' => 'Check for new updates',
 	'update_end' => 'Update process is completed, now you can go to the final step.',
-	'update_finished' => 'Update completed!',
 	'update_last' => 'Last verification: %s',
 	'update_long' => 'This can take a long time, depending on the size of your database. You may have to wait for this page to time out (~5 minutes) and then refresh this page.',
-	'update_problem' => 'The update process has encountered an error: %s',
-	'update_server_not_found' => 'Update server cannot be found. [%s]',
 	'update_start' => 'Start update process',
-	'update_system' => 'Update system',
 	'updated' => 'Modifications have been updated',
 	'upon_reception' => 'upon reception of the article',
-	'user_created' => 'User %s has been created',
-	'user_deleted' => 'User %s has been deleted',
 	'user_filter' => 'Access user filters',
 	'user_filter_help' => 'If there is only one user filter, it is used. Else filters are accessible by their number.',
 	'username' => 'Username',