feature 1616: rename "category" into "album" (second commit; still to come)

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

3 files changed, 17 insertions, 18 deletions

diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 07d6aae25..fbb712e0c 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -59,14 +59,14 @@ $lang['Add group'] = "Add group";
 $lang['Add selected elements to caddie'] = "Add selected elements to caddie";
 $lang['Add'] = "Add";
 $lang['Allow user registration'] = "Allow user registration";
-$lang['Apply to subcategories'] = "Apply to subcategories";
+$lang['Apply to sub-albums'] = "Apply to sub-albums";
 $lang['Associated'] = "Associated";
 $lang['Association to categories'] = "Association to categories";
 $lang['Batch management'] = "Batch management";
 $lang['Caddie management'] = "Caddie management";
 $lang['Caddie'] = "Caddie";
 $lang['Categories authorized thanks to group associations'] = "Categories authorized thanks to group associations";
-$lang['Categories manual order was saved'] = "Categories manual order has been saved";
+$lang['Album manual order was saved'] = "Categories manual order has been saved";
 $lang['Category elements associated to the following categories: %s'] = "Category elements associated to the following categories: %s";
 $lang['Check for upgrade failed for unknown reasons.'] = "Check for upgrade failed for unknown reasons.";
 $lang['Check for upgrade'] = "Check for upgrade";
@@ -107,7 +107,7 @@ $lang['Informations'] = "Informations";
 $lang['Install'] = "Install";
 $lang['Link all category elements to a new category'] = "Link all category elements to a new category";
 $lang['Link all category elements to some existing categories'] = "Link all category elements to existing categories";
-$lang['Linked categories'] = "Linked categories";
+$lang['Linked albums'] = "Linked albums";
 $lang['Lock gallery'] = "Lock gallery";
 $lang['Maintenance'] = "Maintenance";
 $lang['Manage permissions for a category'] = "Manage permissions for a category";
@@ -116,11 +116,11 @@ $lang['Manage permissions for user "%s"'] = "Manage permissions for the user \"%
 $lang['Manage tags'] = "Manage tags";
 $lang['Members'] = "Members";
 $lang['Metadata synchronized from file'] = "Metadata synchronized from file";
-$lang['Move categories'] = "Move categories";
+$lang['Move albums'] = "Move albums";
 $lang['Move'] = "Move";
 $lang['Name'] = "Name";
 $lang['New name'] = "New name";
-$lang['New parent category'] = "New parent category";
+$lang['New parent album'] = "New parent album";
 $lang['New tag'] = "New tag";
 $lang['Number of comments per page'] = "Number of comments per page";
 $lang['Number of rates'] = "Number of rates";
@@ -130,7 +130,7 @@ $lang['Operating system'] = "Operating system";
 $lang['Options'] = "Options";
 $lang['Other private categories'] = "Other private categories";
 $lang['Page banner'] = "Page banner";
-$lang['Parent category'] = "Parent category";
+$lang['Parent album'] = "Parent album";
 $lang['Path'] = "Path";
 $lang['Permalink'] = "Permalink";
 $lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = "Permalink %s has previously been used by category %s. Delete it from the permalinks history first";
@@ -165,7 +165,7 @@ $lang['Show info'] = "Show info";
 $lang['Site manager'] = "Site manager";
 $lang['Status'] = "Status";
 $lang['Statistics'] = "Statistics";
-$lang['Storage category'] = "Storage category";
+$lang['Storage album'] = "Storage album";
 $lang['Sum of rates'] = "Sum of rates";
 $lang['Tag "%s" already exists'] = "Tag \"%s\" already exists";
 $lang['Tag "%s" was added'] = "Tag \"%s\" has been added";
@@ -183,7 +183,7 @@ $lang['Validation'] = "Validation";
 $lang['Version'] = "Version";
 $lang['Virtual categories movement'] = "Virtual categories movement";
 $lang['Virtual categories to move'] = "Virtual categories to move";
-$lang['Virtual category name'] = "Virtual category name";
+$lang['Virtual album name'] = "Virtual album name";
 $lang['Webmaster cannot be deleted'] = "Webmaster cannot be deleted";
 $lang['You are running on development sources, no check possible.'] = "You are running on development sources, no check possible.";
 $lang['You cannot delete your account'] = "You cannot delete your account";
@@ -194,18 +194,18 @@ $lang['Adviser'] = "Adviser";
 $lang['associate to category'] = "associate to category";
 $lang['associate to group'] = "associate to group";
 $lang['Authorized'] = "Authorized";
-$lang['Add a virtual category'] = "Add a virtual category";
+$lang['Add a virtual album'] = "Add a virtual album";
 $lang['Authorize users to add comments on selected categories'] = "Authorize users to add comments on selected categories";
 $lang['The name of a category should not be empty'] = "The name of a category cannot not be empty";
-$lang['Lock categories'] = "Lock categories";
-$lang['Private category'] = "Private category";
-$lang['Public category'] = "Public category";
+$lang['Lock albums'] = "Lock albums";
+$lang['Private'] = "Private";
+$lang['Public'] = "Public";
 $lang['Find a new representant by random'] = "Find a new random representant";
 $lang['Public / Private'] = "Public / Private";
 $lang['Manage authorizations for selected categories'] = "Manage authorizations for selected categories";
 $lang['Select uploadable categories'] = "Select uploadable categories";
-$lang['Virtual category added'] = "Virtual category added";
-$lang['Virtual category deleted'] = "Virtual category deleted";
+$lang['Virtual album added'] = "Virtual album added";
+$lang['Virtual album deleted'] = "Virtual album deleted";
 $lang['Category'] = "Category";
 $lang['Access type'] = "Access type";
 $lang['Comments'] = "Comments";
@@ -765,7 +765,6 @@ $lang['File upload stopped by extension'] = 'File upload stopped by extension';
 $lang['Unknown upload error'] = 'Unknown upload error';
 $lang['Error on file "%s" : %s'] = 'Error on file "%s" : %s';
 $lang['Menu Management'] = 'Menus';
-$lang['apply to sub-categories'] = 'apply to sub-categories';
 $lang['automatic order'] = 'automatic order';
 $lang['manual order'] = 'manual order';
 $lang['Categories automatically sorted'] = 'Categories automatically sorted';
diff --git a/language/en_UK/help/cat_modify.html b/language/en_UK/help/cat_modify.html
index 138fa325b..813fc5c24 100644
--- a/language/en_UK/help/cat_modify.html
+++ b/language/en_UK/help/cat_modify.html
@@ -111,10 +111,10 @@ is the <strong>Delete representant</strong> button.</p>
 
 <ul>
 
-<li><strong>Virtual category name</strong>: Name of the new category to be created, 
+<li><strong>Virtual album name</strong>: Name of the new category to be created, 
 all pictures of the current category will be linked to the new one.</li>
 
-<li><strong>Parent category</strong>: Where the new category will be, 
+<li><strong>Parent album</strong>: Where the new category will be, 
 leave empty to create it at root.</li>
 
 </ul>
diff --git a/language/en_UK/help/cat_move.html b/language/en_UK/help/cat_move.html
index 10237c97b..d781a151e 100644
--- a/language/en_UK/help/cat_move.html
+++ b/language/en_UK/help/cat_move.html
@@ -7,7 +7,7 @@
 <p>Select one or several virtual categories you want to move. 
 If the list is empty, that mean you have not created one yet.</p>
 
-<h3>New parent category</h3>
+<h3>New parent album</h3>
 
 <p>Select the new parent category (virtual or physical). 
 If you do not select any parent, the virtual selected categories will be moved to the root.