aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2006-11-20 22:55:45 +0000
committerrub <rub@piwigo.org>2006-11-20 22:55:45 +0000
commit32a7950e9d1ebd8e2bc0da383404de2977fdb3bc (patch)
tree3f1b43ce26810fcc8729e4c4398c2faba272f4c9
parentb068137ddc462fee65f9fe1cd1809c8854fb3881 (diff)
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
-rw-r--r--identification.php2
-rw-r--r--language/en_UK.iso-8859-1/common.lang.php1
-rw-r--r--language/fr_FR.iso-8859-1/common.lang.php1
-rw-r--r--profile.php2
4 files changed, 2 insertions, 4 deletions
diff --git a/identification.php b/identification.php
index a1a60ec08..5800e109c 100644
--- a/identification.php
+++ b/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'],
diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index d3a96279e..76b565a3f 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/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';
diff --git a/language/fr_FR.iso-8859-1/common.lang.php b/language/fr_FR.iso-8859-1/common.lang.php
index 55015640c..9a6dbd467 100644
--- a/language/fr_FR.iso-8859-1/common.lang.php
+++ b/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';
diff --git a/profile.php b/profile.php
index 26a4fc335..7499d07f3 100644
--- a/profile.php
+++ b/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'],