merge r6418 from branch 2.1 to trunk

- removed multiple definitions of language keys

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

2 files changed, 0 insertions, 13 deletions

diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index f6cbe3b12..6905045a5 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -238,7 +238,6 @@ $lang['group "%s" updated'] = "group \"%s\" updated";
 $lang['group'] = "group";
 $lang['The name of a group must not contain " or \' or be empty.'] = "The name of a group must not contain \" or ' or be empty.";
 $lang['This name is already used by another group.'] = "This name is already used by another group.";
-$lang['Groups'] = "Groups";
 $lang['High definition'] = "High definition";
 $lang['jump to category'] = "jump to category";
 $lang['jump to image'] = "jump to image";
@@ -301,7 +300,6 @@ $lang['Send mail as'] = "Send mail as";
 $lang['Send mail to users'] = "Send mail to users";
 $lang['Send'] = "Send";
 $lang['Options'] = "Options";
-$lang['Send'] = "Send";
 $lang['Subscribed'] = "Subscribed";
 $lang['Subscribe'] = "Subscribe";
 $lang['Parameters'] = "Parameters";
@@ -326,7 +324,6 @@ $lang['Available only with HTML format'] = "Available only with HTML format";
 $lang['no write access'] = "no write access";
 $lang['Permissions'] = "Permissions";
 $lang['private'] = "private";
-$lang['Properties'] = "Properties";
 $lang['public'] = "public";
 $lang['Purge never used notification feeds'] = "Purge never used notification feeds";
 $lang['Purge sessions'] = "Purge sessions";
@@ -362,7 +359,6 @@ $lang['status'] = "status";
 $lang['Directory'] = "Directory";
 $lang['sub-categories'] = "sub-categories";
 $lang['synchronize metadata'] = "synchronize metadata";
-$lang['synchronize'] = "synchronize";
 $lang['target'] = "target";
 $lang['Thumbnail'] = "Thumbnail";
 $lang['title'] = "title";
@@ -444,7 +440,6 @@ $lang['user_status_generic'] = "Generic";
 $lang['user_status_guest'] = "Guest";
 $lang['user_status_normal'] = "User";
 $lang['user_status_webmaster'] = "Webmaster";
-$lang['Users'] = "Users";
 $lang['Virtual category'] = "Virtual category";
 $lang['Waiting'] = "Pending";
 $lang['default'] = "default";
@@ -460,7 +455,6 @@ $lang['Day'] = "Day";
 $lang['Pages seen'] = "Pages seen";
 $lang['Pictures'] = "Pictures";
 $lang['Time'] = "Time";
-$lang['User'] = "User";
 $lang['IP'] = "IP";
 $lang['Element'] = "Element";
 $lang['Section'] = "Section";
@@ -468,7 +462,6 @@ $lang['Tags'] = "Tags";
 $lang['Save page visits by guests'] = "Record pages visited by guests";
 $lang['Save page visits by users'] = "Record pages visited by users";
 $lang['Save page visits by administrators'] = "Record pages visited by administrators";
-$lang['Properties'] = "Properties";
 $lang['An information email was sent to group "%s"'] = "Information email sent to group \"%s\"";
 $lang['Send an information email to group members'] = "Send an information email to group members";
 $lang['Group'] = "Group";
@@ -481,7 +474,6 @@ $lang['none'] = "none";
 $lang['high'] = "high";
 $lang['other'] = "other";
 $lang['Element type'] = "Element type";
-$lang['User'] = "User";
 $lang['Image id'] = "Image id";
 $lang['Summary'] = "Summary";
 $lang['%d line filtered'] = "%d line filtered";
@@ -571,7 +563,6 @@ $lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = "P
 $lang['Can\'t connect to server.'] = "Connection to server impossible.";
 $lang['Purge compiled templates'] = "Purge compiled templates";
 $lang['Caddie is currently empty'] = "The caddie is currently empty";
-$lang['Upload'] = "Upload";
 $lang['Show upload link every time'] = "Show upload link all the time";
 $lang['User access level to upload'] = "User access level for uploading";
 $lang['ACCESS_0'] = "Free access";
@@ -653,7 +644,6 @@ $lang['unknown'] = 'unknown';
 $lang['Upload Photos'] = 'Upload Photos';
 $lang['Drop into category'] = 'Drop into category';
 $lang['+ Add an upload box'] = '+ Add an upload box';
-$lang['Upload'] = 'Upload';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Create the "%s" directory at the root of your Piwigo installation';
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation';
 $lang['existing category'] = 'existing category';
diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index 998d5b4d5..b89fb3e24 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -235,7 +235,6 @@ $lang['Unknown identifier'] = "Unknown identifier";
 $lang['New password'] = "New password";
 $lang['Rate this picture'] = "Rate this picture";
 $lang['Next'] = "Next";
-$lang['Home'] = "Home";
 $lang['no rate'] = "no rate";
 $lang['Elements posted within the last %d day.'] = "Elements posted within the last %d day only.";
 $lang['Elements posted within the last %d days.'] = "Elements posted within the last %d days only.";
@@ -278,7 +277,6 @@ $lang['Empty query. No criteria has been entered.'] = "Empty query. No criteria
 $lang['Search Options'] = "Search options";
 $lang['Search results'] = "Search results";
 $lang['Search in subcategories'] = "Search in subcategories";
-$lang['Search'] = "Search";
 $lang['searched words : %s'] = "searched words : %s";
 $lang['Contact'] = "Contact";
 $lang['set as category representative'] = "set as category representative";
@@ -303,7 +301,6 @@ $lang['the picture must be to the fileformat jpg, gif or png'] = "the picture fi
 $lang['the height of the picture must not exceed :'] = "the picture height must not exceed :";
 $lang['Optional, but recommended : choose a thumbnail to associate to'] = "Optional, but recommended : choose a thumbnail to associate to";
 $lang['the width of the picture must not exceed :'] = "the width of the picture must not exceed :";
-$lang['Author'] = "Author";
 $lang['can\'t upload the picture on the server'] = "the picture cannot be uploaded onto the server";
 $lang['the username must be given'] = "the username is required";
 $lang['A picture\'s name already used'] = "this picture name is already used";