Changeset 6419 for trunk/language/en_UK

Timestamp:

May 29, 2010, 10:57:34 AM (15 years ago)

Author:

rvelices

Message:

merge r6418 from branch 2.1 to trunk

• removed multiple definitions of language keys

Location:

trunk/language/en_UK

Files:

• admin.lang.php (modified) (10 diffs)
• common.lang.php (modified) (3 diffs)

trunk/language/en_UK/admin.lang.php

@@ -239 +239 @@
 $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";
@@ -302 +301 @@
 $lang['Send'] = "Send";
 $lang['Options'] = "Options";
-$lang['Send'] = "Send";
 $lang['Subscribed'] = "Subscribed";
 $lang['Subscribe'] = "Subscribe";
@@ -327 +325 @@
 $lang['Permissions'] = "Permissions";
 $lang['private'] = "private";
-$lang['Properties'] = "Properties";
 $lang['public'] = "public";
 $lang['Purge never used notification feeds'] = "Purge never used notification feeds";
@@ -363 +360 @@
 $lang['sub-categories'] = "sub-categories";
 $lang['synchronize metadata'] = "synchronize metadata";
-$lang['synchronize'] = "synchronize";
 $lang['target'] = "target";
 $lang['Thumbnail'] = "Thumbnail";
@@ -445 +441 @@
 $lang['user_status_normal'] = "User";
 $lang['user_status_webmaster'] = "Webmaster";
-$lang['Users'] = "Users";
 $lang['Virtual category'] = "Virtual category";
 $lang['Waiting'] = "Pending";
@@ -461 +456 @@
 $lang['Pictures'] = "Pictures";
 $lang['Time'] = "Time";
-$lang['User'] = "User";
 $lang['IP'] = "IP";
 $lang['Element'] = "Element";
@@ -469 +463 @@
 $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";
@@ -482 +475 @@
 $lang['other'] = "other";
 $lang['Element type'] = "Element type";
-$lang['User'] = "User";
 $lang['Image id'] = "Image id";
 $lang['Summary'] = "Summary";
@@ -572 +564 @@
 $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";
@@ -654 +645 @@
 $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';

trunk/language/en_UK/common.lang.php

@@ -236 +236 @@
 $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.";
@@ -279 +278 @@
 $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";
@@ -304 +302 @@
 $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";