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

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

4 files changed, 23 insertions, 23 deletions

diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index d6ea94d50..07d6aae25 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -25,14 +25,14 @@
 
 $lang['%d association'] = "%d association";
 $lang['%d associations'] = "%d associations";
-$lang['%d category including'] = "%d category including";
-$lang['%d categories including'] = "%d categories including";
+$lang['%d album including'] = "%d album including";
+$lang['%d albums including'] = "%d albums including";
 $lang['%d physical'] = " %d physical";
 $lang['%d physical'] = " %d physical";
 $lang[' and %d virtual'] = " and %d virtual";
 $lang[' and %d virtual'] = " and %d virtual";
-$lang['%d category moved'] = "%d category moved";
-$lang['%d categories moved'] = "%d categories moved";
+$lang['%d album moved'] = "%d album moved";
+$lang['%d albums moved'] = "%d albums moved";
 $lang['%d group'] = "%d group";
 $lang['%d groups'] = "%d groups";
 $lang['%d member'] = "%d member";
@@ -598,7 +598,7 @@ $lang['overrides existing values with empty ones'] = "overrides existing values
 $lang['manage image ranks'] = "manage image ranks";
 $lang['Manage image ranks'] = "Manage image ranks";
 $lang['Edit ranks'] = "Edit ranks";
-$lang['No element in this category'] = "No element in this category";
+$lang['No element in this album'] = "No element in this album";
 $lang['Images manual order was saved'] = "Images manual order saved";
 $lang['ranks'] = "ranks";
 $lang['By rank'] = 'By rank';
diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index b89fb3e24..9a6e7e34b 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['zero_plural'] = "1";
 
 $lang['%.2f (rated %d times)'] = "%.2f (rated %d times)";
 $lang['%d Kb'] = "%d Kb";
-$lang['%d category updated'] = "%d category updated";
-$lang['%d categories updated'] = "%d categories updated";
+$lang['%d album updated'] = "%d album updated";
+$lang['%d albums updated'] = "%d albums updated";
 $lang['%d comment to validate'] = "%d comment to validate";
 $lang['%d comments to validate'] = "%d comments to validate";
 $lang['%d new comment'] = "%d new comment";
@@ -116,7 +116,7 @@ $lang['Sort by'] = "Sort by";
 $lang['Sort order'] = "Sort order";
 $lang['Tag'] = "Tag";
 $lang['Tags'] = "Tags";
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = "The RSS feed provides notification on new events from this website: new pictures, updated categories, new comments. To be used with a RSS feed reader.";
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = "The RSS feed provides notification on new events from this website: new pictures, updated albums, new comments. To be used with a RSS feed reader.";
 $lang['Unknown feed identifier'] = "Unknown feed identifier";
 $lang['User comments'] = "User comments";
 $lang['Username'] = "Username";
@@ -132,7 +132,7 @@ $lang['Adviser mode enabled'] = "Adviser mode enabled";
 $lang['all'] = "all";
 $lang['ascending'] = "ascending";
 $lang['author(s) : %s'] = "author(s) : %s";
-$lang['Expand all categories'] = "Expand all categories";
+$lang['Expand all albums'] = "Expand all albums";
 $lang['posted after %s (%s)'] = "posted after %s (%s)";
 $lang['posted before %s (%s)'] = "posted before %s (%s)";
 $lang['posted between %s (%s) and %s (%s)'] = "posted between %s (%s) and %s (%s)";
@@ -188,15 +188,15 @@ $lang['Page generated in'] = "Page generated in";
 $lang['guest'] = "guest";
 $lang['Hello'] = "Hello";
 $lang['available for administrators only'] = "available for administrators only";
-$lang['shows images at the root of this category'] = "shows images at the root of this category";
+$lang['shows images at the root of this album'] = "shows images at the root of this album";
 $lang['See last users comments'] = "See last users comments";
 $lang['customize the appareance of the gallery'] = "customize the look of the gallery";
 $lang['search'] = "search";
 $lang['Home'] = "Home";
 $lang['Identification'] = "Identification";
-$lang['in this category'] = "in this category";
-$lang['in %d sub-category'] = "in %d sub-category";
-$lang['in %d sub-categories'] = "in %d sub-categories";
+$lang['in this album'] = "in this album";
+$lang['in %d sub-album'] = "in %d sub-album";
+$lang['in %d sub-albums'] = "in %d sub-albums";
 $lang['included'] = "included";
 $lang['Invalid password!'] = "Invalid password!";
 $lang['Language'] = "Language";
@@ -210,7 +210,7 @@ $lang['Maximum height must be a number superior to 50'] = "Maximum height must b
 $lang['Maximum width of the pictures'] = "Pictures maximum width";
 $lang['Maximum width must be a number superior to 50'] = "Maximum width must be a number greater than 50";
 $lang['display a calendar by creation date'] = "display a calendar by creation date";
-$lang['display all elements in all sub-categories'] = "display all elements in all categories and sub-categories";
+$lang['display all elements in all sub-albums'] = "display all elements in all sub-albums";
 $lang['return to normal view mode'] = "return to normal view mode";
 $lang['display a calendar by posted date'] = "display a calendar by posted date";
 $lang['month'][10] = "October";
@@ -248,8 +248,8 @@ $lang['Preferences'] = "Preferences";
 $lang['Previous'] = "Previous";
 $lang['Random pictures'] = "Random pictures";
 $lang['display a set of random pictures'] = "display a set of random pictures";
-$lang['Recent categories'] = "Recent categories";
-$lang['display recently updated categories'] = "display recently updated categories";
+$lang['Recent albums'] = "Recent albums";
+$lang['display recently updated albums'] = "display recently updated albums";
 $lang['Recent period'] = "Recent period";
 $lang['Recent pictures'] = "Recent pictures";
 $lang['display most recent pictures'] = "display most recent pictures";
@@ -265,7 +265,7 @@ $lang['remove this tag from the list'] = "remove this tag from the list";
 $lang['representative'] = "representative";
 $lang['return to homepage'] = "return to home page";
 $lang['Search for Author'] = "Search for an author";
-$lang['Search in Categories'] = "Search in categories";
+$lang['Search in albums'] = "Search in albums";
 $lang['Search by Date'] = "Search by date";
 $lang['Date'] = "Date";
 $lang['End-Date'] = "End date";
@@ -276,10 +276,10 @@ $lang['Search for any terms'] = "Search for any term";
 $lang['Empty query. No criteria has been entered.'] = "Empty query. No criteria has been entered.";
 $lang['Search Options'] = "Search options";
 $lang['Search results'] = "Search results";
-$lang['Search in subcategories'] = "Search in subcategories";
+$lang['Search in sub-albums'] = "Search in sub-albums";
 $lang['searched words : %s'] = "searched words : %s";
 $lang['Contact'] = "Contact";
-$lang['set as category representative'] = "set as category representative";
+$lang['set as album representative'] = "set as album representative";
 $lang['Show number of comments'] = "Show number of comments";
 $lang['Show number of hits'] = "Show number of hits";
 $lang['slideshow'] = "slideshow";
@@ -321,7 +321,7 @@ $lang['User: %s'] = "User: %s";
 $lang['Email: %s'] = "Email: %s";
 $lang['Admin: %s'] = "Admin: %s";
 $lang['Registration of %s'] = "Registration of %s";
-$lang['Category: %s'] = "Category: %s";
+$lang['Album: %s'] = "Album: %s";
 $lang['Picture name: %s'] = "Picture name: %s";
 $lang['Creation date: %s'] = "Creation date: %s";
 $lang['Waiting page: %s'] = "Awaiting page: %s";
@@ -329,7 +329,7 @@ $lang['Picture uploaded by %s'] = "Picture uploaded by %s";
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = "Bad status for user \"guest\", default status will be used. Please notify the webmaster.";
 $lang['Administrator, webmaster and special user cannot use this method'] = "Administrator, webmaster and special user cannot use this method";
 $lang['a user use already this mail address'] = "another user already use this mail address";
-$lang['Category results for'] = "Category results for";
+$lang['Album results for'] = "Album results for";
 $lang['Tag results for'] = "Tag results for";
 $lang['from %s to %s'] = "from %s to %s";
 $lang['Play of slideshow'] = "Play slideshow";
diff --git a/language/en_UK/help/configuration.html b/language/en_UK/help/configuration.html
index eba6f2a3a..d0bdd99ce 100644
--- a/language/en_UK/help/configuration.html
+++ b/language/en_UK/help/configuration.html
@@ -108,7 +108,7 @@ users.</p>
   <li><strong>Recent period</strong>: By days. Period during which a picture is
   shown as new. Must be greater than 1 day.</li>
 
-  <li><strong>Expand all categories</strong>: Expand all categories by
+  <li><strong>Expand all albums</strong>: Expand all albums by
   default in the menu <em>Warning</em>: this option is resources consuming
   and may generate a huge menu if your category tree contains many
   categories.</li>
diff --git a/language/en_UK/help/search.html b/language/en_UK/help/search.html
index a1ec9357a..cdb296aa9 100644
--- a/language/en_UK/help/search.html
+++ b/language/en_UK/help/search.html
@@ -16,7 +16,7 @@
   if you want to make a "before" query. The year in the last
   field must be entered in the following format : AAAA (i.e. 2004)</dd>
 
-  <dt>Search in Categories</dt>
+  <dt>Search in albums</dt>
   <dd>Select category or categories you wish to search. All
   subcategories can be searched by selecting the parent category and setting enable
   search subcategories below.</dd>