Fix i18n for header and aside_configure

4 files changed, 84 insertions, 80 deletions

diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index a7f51e8f9..bd386f6a0 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -1,6 +1,36 @@
 <?php
 
 return array(
+	'auth' => array(
+		'login' => 'Login',
+		'logout' => 'Logout',
+	),
+	'menu' => array(
+		'about' => 'About',
+		'admin' => 'Administration',
+		'archiving' => 'Archiving',
+		'authentication' => 'Authentication',
+		'check_install' => 'Installation checking',
+		'configuration' => 'Configuration',
+		'display' => 'Display',
+		'logs' => 'Logs',
+		'queries' => 'User queries',
+		'reading' => 'Reading',
+		'sharing' => 'Sharing',
+		'shortcuts' => 'Shortcuts',
+		'stats' => 'Statistics',
+		'update' => 'Update',
+		'user_management' => 'Manage users',
+		'user_profile' => 'Profile',
+	),
+	'title' => array(
+		'_' => 'Title',
+		'authentication' => 'Authentication',
+		'check_install' => 'Installation checking',
+		'global_view' => 'Global view',
+		'user_management' => 'Manage users',
+		'user_profile' => 'Profile',
+	),
 	'Apr' => '\\A\\p\\r\\i\\l',
 	'Aug' => '\\A\\u\\g\\u\\s\\t',
 	'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r',
@@ -13,7 +43,6 @@ return array(
 	'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
 	'Oct' => '\\O\\c\\t\\o\\b\\e\\r',
 	'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
-	'about' => 'About',
 	'about_freshrss' => 'About FreshRSS',
 	'access_denied' => 'You don’t have permission to access this page',
 	'access_protected_feeds' => 'Connection allows to access HTTP protected RSS feeds',
@@ -33,7 +62,6 @@ return array(
 	'api_enabled' => 'Allow <abbr>API</abbr> access <small>(required for mobile apps)</small>',
 	'apr' => 'apr',
 	'april' => 'Apr',
-	'archiving_configuration' => 'Archiving',
 	'archiving_configuration_help' => 'More options are available in the individual stream settings',
 	'article' => 'Article',
 	'article_icons' => 'Article icons',
@@ -110,7 +138,6 @@ return array(
 	'choose_language' => 'Choose a language for FreshRSS',
 	'clear_logs' => 'Clear the logs',
 	'collapse_article' => 'Collapse',
-	'configuration' => 'Configuration',
 	'configuration_updated' => 'Configuration has been updated',
 	'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!',
 	'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favorites and user queries. It cannot be cancelled!',
@@ -136,7 +163,6 @@ return array(
 	'delete' => 'Delete',
 	'delete_articles_every' => 'Remove articles after',
 	'diaspora' => 'Diaspora*',
-	'display' => 'Display',
 	'display_articles_unfolded' => 'Show articles unfolded by default',
 	'display_categories_unfolded' => 'Show categories folded by default',
 	'display_configuration' => 'Display',
@@ -191,21 +217,6 @@ return array(
 	'freshrss_installation' => 'Installation · FreshRSS',
 	'fri' => 'Fri',
 	'g+' => 'Google+',
-	'menu' => array(
-		'admin' => 'Administration',
-		'authentication' => 'Authentication',
-		'check_install' => 'Installation checking',
-		'user_management' => 'Manage users',
-		'user_profile' => 'Profile',
-	),
-	'title' => array(
-		'_' => 'Title',
-		'authentication' => 'Authentication',
-		'check_install' => 'Installation checking',
-		'global_view' => 'Global view',
-		'user_management' => 'Manage users',
-		'user_profile' => 'Profile',
-	),
 	'general_conf_is_ok' => 'General configuration has been saved.',
 	'general_configuration' => 'General configuration',
 	'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">on Github</a> or <a href="mailto:dev@marienfressinaud.fr">by mail</a>',
@@ -256,13 +267,10 @@ return array(
 	'license' => 'License',
 	'load_more' => 'Load more articles',
 	'log_is_ok' => 'Permissions on logs directory are good',
-	'login' => 'Login',
 	'login_configuration' => 'Login',
 	'login_persona_problem' => 'Connection problem with Persona?',
 	'login_required' => 'Login required:',
 	'login_with_persona' => 'Login with Persona',
-	'logout' => 'Logout',
-	'logs' => 'Logs',
 	'logs_empty' => 'Log file is empty',
 	'main_stream' => 'Main stream',
 	'mar' => 'mar',
@@ -340,7 +348,6 @@ return array(
 	'publication_date' => 'Date of publication',
 	'purge_completed' => 'Purge completed (%d articles deleted)',
 	'purge_now' => 'Purge now',
-	'queries' => 'User queries',
 	'query_created' => 'Query "%s" has been created.',
 	'query_deprecated' => 'This query is no longer valid. The referenced category or feed has been deleted.',
 	'query_filter' => 'Filter applied:',
@@ -370,7 +377,6 @@ return array(
 	'query_state_15' => 'Display all articles',
 	'random_string' => 'Random string',
 	'reader_view' => 'Reading view',
-	'reading_configuration' => 'Reading',
 	'reading_confirm' => 'Display a confirmation dialog on “mark all as read” actions',
 	'refresh' => 'Refresh',
 	'related_tags' => 'Related tags',
@@ -392,10 +398,8 @@ return array(
 	'share' => 'Share',
 	'share_name' => 'Share name to display',
 	'share_url' => 'Share URL to use',
-	'sharing' => 'Sharing',
 	'sharing_management' => 'Sharing options management',
 	'shift_for_all_read' => '+ <code>shift</code> to mark all articles as read',
-	'shortcuts' => 'Shortcuts',
 	'shortcuts_article_action' => 'Article actions',
 	'shortcuts_navigation' => 'Navigation',
 	'shortcuts_navigation_help' => 'With the "Shift" modifier, navigation shortcuts apply on feeds.<br/>With the "Alt" modifier, navigation shortcuts apply on categories.',
@@ -410,7 +414,6 @@ return array(
 	'show_read' => 'Show only read',
 	'sort_order' => 'Sort order',
 	'starred_list' => 'List of favourite articles',
-	'stats' => 'Statistics',
 	'stats_entry_count' => 'Entry count',
 	'stats_entry_per_category' => 'Entries per category',
 	'stats_entry_per_day' => 'Entries per day (last 30 days)',
@@ -445,7 +448,6 @@ return array(
 	'tue' => 'Tue',
 	'twitter' => 'Twitter',
 	'unsafe_autologin' => 'Allow unsafe automatic login using the format: ',
-	'update' => 'Update',
 	'update_apply' => 'Apply',
 	'update_can_apply' => 'An update is available.',
 	'update_check' => 'Check for new updates',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 0b2395bd0..b33dc49bc 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -1,6 +1,36 @@
 <?php
 
 return array(
+	'auth' => array(
+		'login' => 'Connexion',
+		'logout' => 'Déconnexion',
+	),
+	'menu' => array(
+		'about' => 'À propos',
+		'admin' => 'Administration',
+		'archiving' => 'Archivage',
+		'authentication' => 'Authentification',
+		'check_install' => 'Vérification de l’installation',
+		'configuration' => 'Configuration',
+		'display' => 'Affichage',
+		'logs' => 'Logs',
+		'queries' => 'Filtres utilisateurs',
+		'reading' => 'Lecture',
+		'sharing' => 'Partage',
+		'shortcuts' => 'Raccourcis',
+		'stats' => 'Statistiques',
+		'update' => 'Mise à jour',
+		'user_management' => 'Gestion des utilisateurs',
+		'user_profile' => 'Profil',
+	),
+	'title' => array(
+		'_' => 'Titre',
+		'authentication' => 'Authentification',
+		'check_install' => 'Vérification de l’installation',
+		'global_view' => 'Vue globale',
+		'user_management' => 'Gestion des utilisateurs',
+		'user_profile' => 'Profil',
+	),
 	'Apr' => '\\a\\v\\r\\i\\l',
 	'Aug' => '\\a\\o\\û\\t',
 	'Dec' => '\\d\\é\\c\\e\\m\\b\\r\\e',
@@ -13,7 +43,6 @@ return array(
 	'Nov' => '\\n\\o\\v\\e\\m\\b\\r\\e',
 	'Oct' => '\\o\\c\\t\\o\\b\\r\\e',
 	'Sep' => '\\s\\e\\p\\t\\e\\m\\b\\r\\e',
-	'about' => 'À propos',
 	'about_freshrss' => 'À propos de FreshRSS',
 	'access_denied' => 'Vous n’avez pas le droit d’accéder à cette page !',
 	'access_protected_feeds' => 'La connexion permet d’accéder aux flux protégés par une authentification HTTP.',
@@ -33,7 +62,6 @@ return array(
 	'api_enabled' => 'Autoriser l’accès par <abbr>API</abbr> <small>(nécessaire pour les applis mobiles)</small>',
 	'apr' => 'avr.',
 	'april' => 'avril',
-	'archiving_configuration' => 'Archivage',
 	'archiving_configuration_help' => 'D’autres options sont disponibles dans la configuration individuelle des flux.',
 	'article' => 'Article',
 	'article_icons' => 'Icônes d’article',
@@ -110,7 +138,6 @@ return array(
 	'choose_language' => 'Choisissez la langue pour FreshRSS',
 	'clear_logs' => 'Effacer les logs',
 	'collapse_article' => 'Refermer',
-	'configuration' => 'Configuration',
 	'configuration_updated' => 'La configuration a été mise à jour.',
 	'confirm_action' => 'Êtes-vous sûr(e) de vouloir continuer ? Cette action ne peut être annulée !',
 	'confirm_action_feed_cat' => 'Êtes-vous sûr(e) de vouloir continuer ? Vous perdrez les favoris et les filtres associés. Cette action ne peut être annulée !',
@@ -139,7 +166,6 @@ return array(
 	'display' => 'Affichage',
 	'display_articles_unfolded' => 'Afficher les articles dépliés par défaut',
 	'display_categories_unfolded' => 'Afficher les catégories pliées par défaut',
-	'display_configuration' => 'Affichage',
 	'do_not_change_if_doubt' => 'Laissez tel quel dans le doute',
 	'dom_is_nok' => 'Il manque une librairie pour parcourir le DOM (paquet php-xml)',
 	'dom_is_ok' => 'Vous disposez du nécessaire pour parcourir le DOM',
@@ -191,21 +217,6 @@ return array(
 	'freshrss_installation' => 'Installation · FreshRSS',
 	'fri' => 'ven.',
 	'g+' => 'Google+',
-	'menu' => array(
-		'admin' => 'Administration',
-		'authentication' => 'Authentification',
-		'check_install' => 'Vérification de l’installation',
-		'user_management' => 'Gestion des utilisateurs',
-		'user_profile' => 'Profil',
-	),
-	'title' => array(
-		'_' => 'Titre',
-		'authentication' => 'Authentification',
-		'check_install' => 'Vérification de l’installation',
-		'global_view' => 'Vue globale',
-		'user_management' => 'Gestion des utilisateurs',
-		'user_profile' => 'Profil',
-	),
 	'general_conf_is_ok' => 'La configuration générale a été enregistrée.',
 	'general_configuration' => 'Configuration générale',
 	'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">sur Github</a> ou <a href="mailto:dev@marienfressinaud.fr">par courriel</a>',
@@ -256,13 +267,10 @@ return array(
 	'license' => 'Licence',
 	'load_more' => 'Charger plus d’articles',
 	'log_is_ok' => 'Les droits sur le répertoire des logs sont bons',
-	'login' => 'Connexion',
 	'login_configuration' => 'Identification',
 	'login_persona_problem' => 'Problème de connexion à Persona ?',
 	'login_required' => 'Accès protégé par mot de passe :',
 	'login_with_persona' => 'Connexion avec Persona',
-	'logout' => 'Déconnexion',
-	'logs' => 'Logs',
 	'logs_empty' => 'Les logs sont vides.',
 	'main_stream' => 'Flux principal',
 	'mar' => 'mar.',
@@ -340,7 +348,6 @@ return array(
 	'publication_date' => 'Date de publication',
 	'purge_completed' => 'Purge effectuée (%d articles supprimés).',
 	'purge_now' => 'Purger maintenant',
-	'queries' => 'Filtres utilisateurs',
 	'query_created' => 'Le filtre "%s" a bien été créé.',
 	'query_deprecated' => 'Ce filtre n’est plus valide. La catégorie ou le flux concerné a été supprimé.',
 	'query_filter' => 'Filtres appliqués :',
@@ -370,7 +377,6 @@ return array(
 	'query_state_15' => 'Afficher tous les articles',
 	'random_string' => 'Chaîne aléatoire',
 	'reader_view' => 'Vue lecture',
-	'reading_configuration' => 'Lecture',
 	'reading_confirm' => 'Afficher une confirmation lors des actions “marquer tout comme lu”',
 	'refresh' => 'Actualisation',
 	'related_tags' => 'Tags associés',
@@ -392,10 +398,8 @@ return array(
 	'share' => 'Partager',
 	'share_name' => 'Nom du partage à afficher',
 	'share_url' => 'URL du partage à utiliser',
-	'sharing' => 'Partage',
 	'sharing_management' => 'Gestion des options de partage',
 	'shift_for_all_read' => '+ <code>shift</code> pour marquer tous les articles comme lus',
-	'shortcuts' => 'Raccourcis',
 	'shortcuts_article_action' => 'Actions associées à l’article courant',
 	'shortcuts_navigation' => 'Navigation',
 	'shortcuts_navigation_help' => 'Avec le modificateur "Shift", les raccourcis de navigation s’appliquent aux flux.<br/>Avec le modificateur "Alt", les raccourcis de navigation s’appliquent aux catégories.',
@@ -410,7 +414,6 @@ return array(
 	'show_read' => 'Afficher les lus',
 	'sort_order' => 'Ordre de tri',
 	'starred_list' => 'Liste des articles favoris',
-	'stats' => 'Statistiques',
 	'stats_entry_count' => 'Nombre d’articles',
 	'stats_entry_per_category' => 'Articles par catégorie',
 	'stats_entry_per_day' => 'Nombre d’articles par jour (30 derniers jours)',
@@ -445,7 +448,6 @@ return array(
 	'tue' => 'mar.',
 	'twitter' => 'Twitter',
 	'unsafe_autologin' => 'Autoriser les connexions automatiques non-sûres au format : ',
-	'update' => 'Mise à jour',
 	'update_apply' => 'Appliquer la mise à jour',
 	'update_can_apply' => 'Une mise à jour est disponible.',
 	'update_check' => 'Vérifier les mises à jour',
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 53c52d3e3..25b8037e6 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -1,22 +1,22 @@
 <ul class="nav nav-list aside">
-	<li class="nav-header"><?php echo _t('configuration'); ?></li>
+	<li class="nav-header"><?php echo _t('gen.menu.configuration'); ?></li>
 	<li class="item<?php echo Minz_Request::actionName() === 'display' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('configure', 'display'); ?>"><?php echo _t('display_configuration'); ?></a>
+		<a href="<?php echo _url('configure', 'display'); ?>"><?php echo _t('gen.menu.display'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::actionName() === 'reading' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('configure', 'reading'); ?>"><?php echo _t('reading_configuration'); ?></a>
+		<a href="<?php echo _url('configure', 'reading'); ?>"><?php echo _t('gen.menu.reading'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::actionName() === 'archiving' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('configure', 'archiving'); ?>"><?php echo _t('archiving_configuration'); ?></a>
+		<a href="<?php echo _url('configure', 'archiving'); ?>"><?php echo _t('gen.menu.archiving'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::actionName() === 'sharing' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('configure', 'sharing'); ?>"><?php echo _t('sharing'); ?></a>
+		<a href="<?php echo _url('configure', 'sharing'); ?>"><?php echo _t('gen.menu.sharing'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::actionName() === 'shortcut' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('configure', 'shortcut'); ?>"><?php echo _t('shortcuts'); ?></a>
+		<a href="<?php echo _url('configure', 'shortcut'); ?>"><?php echo _t('gen.menu.shortcuts'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::actionName() === 'queries' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('queries'); ?></a>
+		<a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('gen.menu.queries'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::controllerName() === 'user' &&
 	                          Minz_Request::actionName() === 'profile'? ' active' : ''; ?>">
@@ -37,7 +37,7 @@
 	</li>
 	<li class="item<?php echo Minz_Request::controllerName() === 'update' &&
 	                          Minz_Request::actionName() === 'index' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('update'); ?></a>
+		<a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('gen.menu.update'); ?></a>
 	</li>
 	<?php } ?>
 </ul>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index c73d9cdbb..429cfc1d2 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -2,9 +2,9 @@
 if (Minz_Configuration::canLogIn()) {
 	?><ul class="nav nav-head nav-login"><?php
 		if (FreshRSS_Auth::hasAccess()) {
-			?><li class="item"><?php echo _i('logout'); ?> <a class="signout" href="<?php echo _url('auth', 'logout'); ?>"><?php echo _t('logout'); ?></a></li><?php
+			?><li class="item"><?php echo _i('logout'); ?> <a class="signout" href="<?php echo _url('auth', 'logout'); ?>"><?php echo _t('gen.auth.logout'); ?></a></li><?php
 		} else {
-			?><li class="item"><?php echo _i('login'); ?> <a class="signin" href="<?php echo _url('auth', 'login'); ?>"><?php echo _t('login'); ?></a></li><?php
+			?><li class="item"><?php echo _i('login'); ?> <a class="signin" href="<?php echo _url('auth', 'login'); ?>"><?php echo _t('gen.auth.login'); ?></a></li><?php
 		}
 	?></ul><?php
 }
@@ -25,7 +25,7 @@ if (Minz_Configuration::canLogIn()) {
 		<form action="<?php echo _url('index', 'index'); ?>" method="get">
 			<div class="stick">
 				<?php $search = Minz_Request::param('search', ''); ?>
-				<input type="search" name="search" id="search" class="extend" value="<?php echo $search; ?>" placeholder="<?php echo _t('search'); ?>" />
+				<input type="search" name="search" id="search" class="extend" value="<?php echo $search; ?>" placeholder="<?php echo _t('gen.search'); ?>" />
 
 				<?php $get = Minz_Request::param('get', ''); ?>
 				<?php if ($get != '') { ?>
@@ -55,13 +55,13 @@ if (Minz_Configuration::canLogIn()) {
 			<a class="btn dropdown-toggle" href="#dropdown-configure"><?php echo _i('configure'); ?></a>
 			<ul class="dropdown-menu">
 				<li class="dropdown-close"><a href="#close">❌</a></li>
-				<li class="dropdown-header"><?php echo _t('configuration'); ?></li>
-				<li class="item"><a href="<?php echo _url('configure', 'display'); ?>"><?php echo _t('display_configuration'); ?></a></li>
-				<li class="item"><a href="<?php echo _url('configure', 'reading'); ?>"><?php echo _t('reading_configuration'); ?></a></li>
-				<li class="item"><a href="<?php echo _url('configure', 'archiving'); ?>"><?php echo _t('archiving_configuration'); ?></a></li>
-				<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="dropdown-header"><?php echo _t('gen.menu.configuration'); ?></li>
+				<li class="item"><a href="<?php echo _url('configure', 'display'); ?>"><?php echo _t('gen.menu.display'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('configure', 'reading'); ?>"><?php echo _t('gen.menu.reading'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('configure', 'archiving'); ?>"><?php echo _t('gen.menu.archiving'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('configure', 'sharing'); ?>"><?php echo _t('gen.menu.sharing'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('configure', 'shortcut'); ?>"><?php echo _t('gen.menu.shortcuts'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('gen.menu.queries'); ?></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>
@@ -69,23 +69,23 @@ if (Minz_Configuration::canLogIn()) {
 				<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>
+				<li class="item"><a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('gen.menu.update'); ?></a></li>
 				<?php } ?>
 				<li class="separator"></li>
-				<li class="item"><a href="<?php echo _url('stats', 'index'); ?>"><?php echo _t('stats'); ?></a></li>
-				<li class="item"><a href="<?php echo _url('index', 'logs'); ?>"><?php echo _t('logs'); ?></a></li>
-				<li class="item"><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('about'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('stats', 'index'); ?>"><?php echo _t('gen.menu.stats'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('index', 'logs'); ?>"><?php echo _t('gen.menu.logs'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('gen.menu.about'); ?></a></li>
 				<?php
 				if (Minz_Configuration::canLogIn()) {
 					?><li class="separator"></li>
-				<li class="item"><a class="signout" href="<?php echo _url('auth', 'logout'); ?>"><?php echo _i('logout'), ' ', _t('logout'); ?></a></li><?php
+				<li class="item"><a class="signout" href="<?php echo _url('auth', 'logout'); ?>"><?php echo _i('logout'), ' ', _t('gen.auth.logout'); ?></a></li><?php
 				} ?>
 			</ul>
 		</div>
 	</div>
 	<?php } elseif (Minz_Configuration::canLogIn()) { ?>
 	<div class="item configure">
-		<?php echo _i('login'); ?><a class="signin" href="<?php echo _url('auth', 'login'); ?>"><?php echo _t('login'); ?></a>
+		<?php echo _i('login'); ?><a class="signin" href="<?php echo _url('auth', 'login'); ?>"><?php echo _t('gen.auth.login'); ?></a>
 	</div>
 	<?php } ?>
 </div>