Changeset 1614

Timestamp:

Nov 20, 2006, 11:55:45 PM (18 years ago)

Author:

rub

Message:

Resolved Issue ID 0000587:

o Not uniform use of langlogin and langUsername

Merge branch-1_6 1612:1613 into BSF

Location:

trunk

Files:

• identification.php (modified) (1 diff)
• language/en_UK.iso-8859-1/common.lang.php (modified) (1 diff)
• language/fr_FR.iso-8859-1/common.lang.php (modified) (1 diff)
• profile.php (modified) (1 diff)

trunk/identification.php

@@ -87 +87 @@
   array(
     'L_TITLE' => $lang['identification'],
-    'L_USERNAME' => $lang['login'],
+    'L_USERNAME' => $lang['Username'],
     'L_PASSWORD' => $lang['password'],
     'L_LOGIN' => $lang['submit'],

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

@@ -475 +475 @@
 $lang['last_page'] = 'Last';
 $lang['link_info_image'] = 'Modify information';
-$lang['login'] = 'Login';
 $lang['logout'] = 'Logout';
 $lang['mail_address'] = 'E-mail address';

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

@@ -474 +474 @@
 $lang['last_page'] = 'Dernier';
 $lang['link_info_image'] = 'Modifier les informations';
-$lang['login'] = 'Connexion';
 $lang['logout'] = 'Déconnexion';
 $lang['mail_address'] = $lang['Email address'];

trunk/profile.php

@@ -197 +197 @@
     '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'],