feature 1616: rename "category" into "album" (4th commit; almost there)

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

5 files changed, 33 insertions, 35 deletions

diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index d0e0de64f..a94e7da17 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -61,11 +61,10 @@ $lang['Add'] = "Add";
 $lang['Allow user registration'] = "Allow user registration";
 $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['Albums authorized thanks to group associations'] = "Albums authorized thanks to group associations";
 $lang['Album manual order was saved'] = "Album manual order was saved";
 $lang['Album elements associated to the following albums: %s'] = "Album elements associated to the following albums: %s";
 $lang['Check for upgrade failed for unknown reasons.'] = "Check for upgrade failed for unknown reasons.";
@@ -125,17 +124,17 @@ $lang['New tag'] = "New tag";
 $lang['Number of comments per page'] = "Number of comments per page";
 $lang['Number of rates'] = "Number of rates";
 $lang['Number of thumbnails to create'] = "Number of thumbnails to create";
-$lang['Only private categories are listed'] = "Only private categories are listed";
+$lang['Only private albums are listed'] = "Only private albums are listed";
 $lang['Operating system'] = "Operating system";
 $lang['Options'] = "Options";
-$lang['Other private categories'] = "Other private categories";
+$lang['Other private albums'] = "Other private albums";
 $lang['Page banner'] = "Page banner";
 $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";
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = "Permalink %s has previously been used by album %s. Delete it from the permalinks history first";
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = "The permalink name must be composed of a-z, A-Z, 0-9, \"-\", \"_\" or \"/\". It must not be numeric or begin with a number followed by \"-\"";
-$lang['Permalink %s is already used by category %s'] = "Permalink %s is already used by category %s";
+$lang['Permalink %s is already used by album %s'] = "Permalink %s is already used by album %s";
 $lang['Permalink history'] = "Permalinks history";
 $lang['Permalinks'] = "Permalinks";
 $lang['Permission denied'] = "Permission denied";
@@ -153,7 +152,7 @@ $lang['Rating'] = "Rating";
 $lang['Reject All'] = "Reject All";
 $lang['Reject'] = "Reject";
 $lang['Representant'] = "Representant";
-$lang['Representation of categories'] = "Categories representation";
+$lang['Representation of albums'] = "Representation of albums";
 $lang['Representative'] = "Representative";
 $lang['Represents'] = "Represents";
 $lang['Save order'] = "Save order";
@@ -186,7 +185,7 @@ $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";
-$lang['You cannot move a album in its own sub album'] = "You cannot move a category into its own sub category";
+$lang['You cannot move an album in its own sub album'] = "You cannot move an album in its own sub album";
 $lang['You need to confirm deletion'] = "You must confirm deletion";
 $lang['add tags'] = "add tags";
 $lang['Adviser'] = "Adviser";
@@ -194,18 +193,17 @@ $lang['Associate to album'] = "Associate to album";
 $lang['associate to group'] = "associate to group";
 $lang['Authorized'] = "Authorized";
 $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['Authorize users to add comments on selected albums'] = "Authorize users to add comments on selected albums";
 $lang['The name of an album must not be empty'] = "The name of an album must not be empty";
 $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['Manage authorizations for selected albums'] = "Manage authorizations for selected albums";
+$lang['Select uploadable albums'] = "Select uploadable albums";
 $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";
 $lang['Information data registered in database'] = "Information data registered in database";
@@ -361,10 +359,10 @@ $lang['synchronize metadata'] = "synchronize metadata";
 $lang['target'] = "target";
 $lang['Thumbnail'] = "Thumbnail";
 $lang['title'] = "title";
-$lang['Categories management'] = "Categories management";
+$lang['Album list management'] = "Album list management";
 $lang['Piwigo configuration'] = "Piwigo configuration";
 $lang['Piwigo administration'] = "Piwigo administration";
-$lang['Edit a category'] = "Edit a category";
+$lang['Edit album'] = "Edit album";
 $lang['Group management'] = "Groups management";
 $lang['User list'] = "Users list";
 $lang['Modify informations about a picture'] = "Modify picture information";
@@ -392,12 +390,12 @@ $lang['for this file format'] = "for this file format";
 $lang['unit mode'] = "single mode";
 $lang['Unlocked'] = "Unlocked";
 $lang['unset'] = "unset";
-$lang['Update albums informations'] = "Update categories information";
+$lang['Update albums informations'] = "Update albums information";
 $lang['Update images informations'] = "Update images information";
 $lang['Synchronize'] = "Synchronize";
-$lang['reduce to single existing categories'] = "reduce to single existing categories";
+$lang['reduce to single existing albums'] = "reduce to single existing albums";
 $lang['Choose an option'] = "Choose an option";
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = "display maximum information (added categories and elements, deleted categories and elements)";
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = "display maximum information (added albums and elements, deleted albums and elements)";
 $lang['Piwigo version differs on the remote site'] = "Piwigo version differs on the remote site";
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = "Versions of create_listing_file.php on the remote site and Piwigo must be the same";
 $lang['listing.xml file was not found'] = "listing.xml file not found";
@@ -409,12 +407,12 @@ $lang['File/directory read error'] = "File/directory read error";
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = "The file or directory cannot be accessed (either it does not exist or the access is denied)";
 $lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = "a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory \"thumbnail\" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :";
 $lang['missing thumbnail'] = "missing thumbnail";
-$lang['categories deleted in the database'] = "categories deleted in the database";
+$lang['albums deleted in the database'] = "albums deleted in the database";
 $lang['elements deleted in the database'] = "elements deleted in the database";
 $lang['images candidates for metadata synchronization'] = "images candidates for metadata synchronization";
 $lang['elements informations synchronized with files metadata'] = "elements informations synchronized with files metadata";
 $lang['errors during synchronization'] = "errors during synchronization";
-$lang['categories added in the database'] = "categories added in the database";
+$lang['albums added in the database'] = "albums added in the database";
 $lang['elements added in the database'] = "elements added in the database";
 $lang['elements updated in the database'] = "elements updated in the database";
 $lang['Search for new images in the directories'] = "Search for new images in the directories";
@@ -446,7 +444,7 @@ $lang['Toggle \'default group\' property'] = "Reverse 'default group' property";
 $lang['Advanced features'] = "Advanced features";
 $lang['Not linked elements'] = "Unlinked elements";
 $lang['Specials'] = "Specials";
-$lang['Files with same name in more than one physical category'] = "Identical files names in more than one physical category";
+$lang['Files with same name in more than one physical album'] = "Identical files names in more than one physical album";
 $lang['Overall'] = "Overview";
 $lang['Year'] = "Year";
 $lang['Month'] = "Month";
@@ -591,7 +589,7 @@ $lang['Templates configuration has been recorded.'] = "Templates configuration h
 $lang['All optimizations have been successfully completed.'] = "All optimizations have been successfully completed.";
 $lang['Optimizations have been completed with some errors.'] = "Optimizations have been completed with some errors.";
 $lang['Modify information'] = "Modify information";
-$lang['edit category informations'] = "edit this category information";
+$lang['edit album'] = "edit album";
 $lang['nothing'] = "nothing";
 $lang['overrides existing values with empty ones'] = "overrides existing values with empty ones";
 $lang['manage image ranks'] = "manage image ranks";
@@ -638,18 +636,18 @@ $lang['Set as default theme for unregistered and new users'] = "Set as default t
 $lang['unknown'] = 'unknown';
 
 $lang['Upload Photos'] = 'Upload Photos';
-$lang['Drop into category'] = 'Drop into category';
+$lang['Drop into album'] = 'Drop into album';
 $lang['+ Add an upload box'] = '+ Add an upload box';
 $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';
-$lang['create a new category'] = 'create a new category';
+$lang['existing album'] = 'existing album';
+$lang['create a new album'] = 'create a new album';
 $lang['Album name'] = 'Album name';
-$lang['Category "%s" has been added'] = 'Category "%s" has been added';
+$lang['Album "%s" has been added'] = 'Album "%s" has been added';
 $lang['Uploaded Photos'] = 'Uploaded Photos';
 $lang['%d photos uploaded'] = '%d photos uploaded';
 $lang['Privacy level set to "%s"'] = 'Privacy level set to "%s"';
-$lang['Category "%s" now contains %d photos'] = 'Category "%s" now contains %d photos';
+$lang['Album "%s" now contains %d photos'] = 'Album "%s" now contains %d photos';
 $lang['Manage this set of %d photos'] = 'Manage this set of %d photos';
 $lang['Select files'] = 'Select files';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG files or ZIP archives with JPEG files inside please.';
@@ -766,5 +764,5 @@ $lang['Error on file "%s" : %s'] = 'Error on file "%s" : %s';
 $lang['Menu Management'] = 'Menus';
 $lang['automatic order'] = 'automatic order';
 $lang['manual order'] = 'manual order';
-$lang['Categories automatically sorted'] = 'Categories automatically sorted';
+$lang['Albums automatically sorted'] = 'Albums automatically sorted';
 ?>
diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index 9a6e7e34b..e356ed40d 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = "At least one listed crit
 $lang['At least one tag must match'] = "At least one tag must match";
 $lang['Author'] = "Author";
 $lang['Average rate'] = "Average rate";
-$lang['Categories'] = "Categories";
-$lang['Category'] = "Category";
+$lang['Albums'] = "Albums";
+$lang['Album'] = "Album";
 $lang['Close this window'] = "Close this window";
 $lang['Complete RSS feed (images, comments)'] = "Complete RSS feed (images, comments)";
 $lang['Confirm Password'] = "Confirm Password";
diff --git a/language/en_UK/help/cat_modify.html b/language/en_UK/help/cat_modify.html
index 392ad30a1..460e66661 100644
--- a/language/en_UK/help/cat_modify.html
+++ b/language/en_UK/help/cat_modify.html
@@ -1,4 +1,4 @@
-<h2>Edit a category</h2>
+<h2>Edit album</h2>
 
 <h3>Informations</h3>
 
@@ -85,7 +85,7 @@ it contains only sub-categories and no direct element (just as the root category
   <li><span class="pwgScreen">Administration, Categories, Properties,
   Representative</span>. See the help of this screen for details.</li>
 
-  <li><span class="pwgScreen">Edit a category</span> (the present screen).</li>
+  <li><span class="pwgScreen">Edit album</span> (the present screen).</li>
 
 </ul>
 
diff --git a/language/en_UK/help/cat_options.html b/language/en_UK/help/cat_options.html
index 4e1556fd7..682c2cce8 100644
--- a/language/en_UK/help/cat_options.html
+++ b/language/en_UK/help/cat_options.html
@@ -1,4 +1,4 @@
-<h2>Category options</h2>
+<h2>Album options</h2>
 
 <p>Options management for several categories at once.</p>
 
@@ -8,7 +8,7 @@
   <dd>Make categories uploadable for gallery visitors. The option ia available for physical local categories only.</dd>
 
   <dt>Comments</dt>
-  <dd>Authorize users to add comments on selected categories.
+  <dd>Authorize users to add comments on selected albums.
 Selects the categories which are commentable. 
 An image is commentable if it belongs to at least one category that is commentable.</dd>
 
diff --git a/language/en_UK/help/photos_add_ftp.html b/language/en_UK/help/photos_add_ftp.html
index a416c14c2..1fcafa364 100644
--- a/language/en_UK/help/photos_add_ftp.html
+++ b/language/en_UK/help/photos_add_ftp.html
@@ -13,7 +13,7 @@
   <li>Go to <span class="pwgScreen">Administration</span> and click on the big Synchronization button.</li>
 </ol>
 
-Congratulations! You have successfully created the first category of your photo gallery.
+Congratulations! You have successfully created the first album of your photo gallery.
 </fieldset>
 
 <fieldset>
@@ -23,7 +23,7 @@ Congratulations! You have successfully created the first category of your photo
 
   <li>
 
-    <p>Category directories are in the Piwigo directory
+    <p>Album directories are in the Piwigo directory
     "galleries". Here follows the directory tree of a very small gallery (but
     using many features):</p>