Resolved Issue ID 0000587:

o Not uniform use of lang['login'] and lang['Username']

Merge branch-1_6 1612:1613 into BSF

git-svn-id: http://piwigo.org/svn/trunk@1614 68402e56-0260-453c-a942-63ccdbb3a9ee

identification.php

@@ -86,7 +86,7 @@ $template->set_filenames( array('identification'=>'identification.tpl') );
 $template->assign_vars(
   array(
     'L_TITLE' => $lang['identification'],
-    'L_USERNAME' => $lang['login'],
+    'L_USERNAME' => $lang['Username'],
     'L_PASSWORD' => $lang['password'],
     'L_LOGIN' => $lang['submit'],
     'L_GUEST' => $lang['ident_guest_visit'],

language/en_UK.iso-8859-1/common.lang.php

@@ -474,7 +474,6 @@ $lang['language']='Language';
 $lang['last %d days'] = 'last %d days';
 $lang['last_page'] = 'Last';
 $lang['link_info_image'] = 'Modify information';
-$lang['login'] = 'Login';
 $lang['logout'] = 'Logout';
 $lang['mail_address'] = 'E-mail address';
 $lang['mandatory'] = 'obligatory';

language/fr_FR.iso-8859-1/common.lang.php

@@ -473,7 +473,6 @@ $lang['language'] = 'Langue';
 $lang['last %d days'] = '%d derniers jours';
 $lang['last_page'] = 'Dernier';
 $lang['link_info_image'] = 'Modifier les informations';
-$lang['login'] = 'Connexion';
 $lang['logout'] = 'Déconnexion';
 $lang['mail_address'] = $lang['Email address'];
 $lang['mandatory'] = 'obligatoire';

profile.php

@@ -196,7 +196,7 @@ $template->assign_vars(
     'L_TITLE' => $lang['customize_title'],
     'L_REGISTRATION_INFO' => $lang['register_title'],
     'L_PREFERENCES' => $lang['preferences'],
-    'L_USERNAME' => $lang['login'],
+    'L_USERNAME' => $lang['Username'],
     'L_EMAIL' => $lang['mail_address'],
     'L_CURRENT_PASSWORD' => $lang['password'],
     'L_CURRENT_PASSWORD_HINT' => $lang['password_hint'],