6 files changed, 24 insertions, 25 deletions
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index fbb712e0c..d0e0de64f 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -66,8 +66,8 @@ $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['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['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.";
 $lang['Check for upgrade'] = "Check for upgrade";
 $lang['Comments for all'] = "Comments for all";
@@ -105,12 +105,12 @@ $lang['Guests'] = "Guests";
 $lang['History'] = "History";
 $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['Link all album elements to a new album'] = "Link all album elements to a new album";
+$lang['Link all album elements to some existing albums'] = "Link all album elements to some existing albums";
 $lang['Linked albums'] = "Linked albums";
 $lang['Lock gallery'] = "Lock gallery";
 $lang['Maintenance'] = "Maintenance";
-$lang['Manage permissions for a category'] = "Manage permissions for a category";
+$lang['Edit album permissions'] = "Edit album permissions";
 $lang['Manage permissions for group "%s"'] = "Manage permissions for the group \"%s\"";
 $lang['Manage permissions for user "%s"'] = "Manage permissions for the user \"%s\"";
 $lang['Manage tags'] = "Manage tags";
@@ -158,7 +158,7 @@ $lang['Representative'] = "Representative";
 $lang['Represents'] = "Represents";
 $lang['Save order'] = "Save order";
 $lang['Save to permalink history'] = "Save to permalinks history";
-$lang['Select at least one category'] = "Select at least one category";
+$lang['Select at least one album'] = "Select at least one album";
 $lang['Select at least one picture'] = "Select at least one picture";
 $lang['Select at least one user'] = "Select at least one user";
 $lang['Show info'] = "Show info";
@@ -181,22 +181,21 @@ $lang['Validate All'] = "Validate All";
 $lang['Validate'] = "Validate";
 $lang['Validation'] = "Validation";
 $lang['Version'] = "Version";
-$lang['Virtual categories movement'] = "Virtual categories movement";
-$lang['Virtual categories to move'] = "Virtual categories to move";
+$lang['Virtual albums to move'] = "Virtual albums to move";
 $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 category in its own sub category'] = "You cannot move a category into its own sub category";
+$lang['You cannot move a album in its own sub album'] = "You cannot move a category into its own sub category";
 $lang['You need to confirm deletion'] = "You must confirm deletion";
 $lang['add tags'] = "add tags";
 $lang['Adviser'] = "Adviser";
-$lang['associate to category'] = "associate to category";
+$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['The name of a category should not be empty'] = "The name of a category cannot not be empty";
+$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";
@@ -218,11 +217,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = "The
 $lang['Configuration'] = "Configuration";
 $lang['confirm'] = "confirm";
 $lang['Date'] = "Date";
-$lang['delete category'] = "delete category";
-$lang['dissociate from category'] = "dissociate from category";
+$lang['delete album'] = "delete album";
+$lang['Dissociate from album'] = "Dissociate from album";
 $lang['dissociate from group'] = "dissociate from group";
-$lang['edit category permissions'] = "edit category permissions";
-$lang['Category informations updated successfully.'] = "Category informations updated successfully.";
+$lang['edit album permissions'] = "edit album permissions";
+$lang['Album updated successfully'] = "Album updated successfully";
 $lang['Authorize upload'] = "Authorize upload";
 $lang['elements per page'] = "elements per page";
 $lang['elements'] = "elements";
@@ -239,13 +238,13 @@ $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['High definition'] = "High definition";
-$lang['jump to category'] = "jump to category";
+$lang['jump to album'] = "jump to album";
 $lang['jump to image'] = "jump to image";
 $lang['leave'] = "leave";
 $lang['Lock'] = "Lock";
 $lang['Locked'] = "Locked";
-$lang['manage category elements'] = "Manage category elements";
-$lang['manage sub-categories'] = "Manage sub-categories";
+$lang['manage album elements'] = "manage album elements";
+$lang['manage sub-albums'] = "manage sub-albums";
 $lang['Manage'] = "Manage";
 $lang['maximum height'] = "Maximum height";
 $lang['maximum width'] = "Maximum width";
@@ -393,7 +392,7 @@ $lang['for this file format'] = "for this file format";
 $lang['unit mode'] = "single mode";
 $lang['Unlocked'] = "Unlocked";
 $lang['unset'] = "unset";
-$lang['Update categories informations'] = "Update categories information";
+$lang['Update albums informations'] = "Update categories information";
 $lang['Update images informations'] = "Update images information";
 $lang['Synchronize'] = "Synchronize";
 $lang['reduce to single existing categories'] = "reduce to single existing categories";
@@ -645,7 +644,7 @@ $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Cr
 $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['Category name'] = 'Category name';
+$lang['Album name'] = 'Album name';
 $lang['Category "%s" has been added'] = 'Category "%s" has been added';
 $lang['Uploaded Photos'] = 'Uploaded Photos';
 $lang['%d photos uploaded'] = '%d photos uploaded';
diff --git a/language/en_UK/help/cat_modify.html b/language/en_UK/help/cat_modify.html
index 813fc5c24..392ad30a1 100644
--- a/language/en_UK/help/cat_modify.html
+++ b/language/en_UK/help/cat_modify.html
@@ -107,7 +107,7 @@ representant. Just use <strong>Delete representant</strong> button.</p>
 informations about a picture</span> screen. The only option on the current screen
 is the <strong>Delete representant</strong> button.</p>
 
-<h3>Link all category elements to a new category</h3>
+<h3>Link all album elements to a new album</h3>
 
 <ul>
 
diff --git a/language/en_UK/help/cat_move.html b/language/en_UK/help/cat_move.html
index d781a151e..81e337c53 100644
--- a/language/en_UK/help/cat_move.html
+++ b/language/en_UK/help/cat_move.html
@@ -2,7 +2,7 @@
 
 <p>Only virtual categories can have a new parent category.</p>
 
-<h3>Virtual categories to move</h3>
+<h3>Virtual albums to move</h3>
 
 <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>
diff --git a/language/en_UK/help/cat_perm.html b/language/en_UK/help/cat_perm.html
index c320ecfab..2a613e4c9 100644
--- a/language/en_UK/help/cat_perm.html
+++ b/language/en_UK/help/cat_perm.html
@@ -1,4 +1,4 @@
-<h2>Manage permissions for a category</h2>
+<h2>Edit album permissions</h2>
 
 <p>This screen is only available for private categories. Here you can select
 users and groups authorized for a category.</p>
diff --git a/language/en_UK/help/configuration.html b/language/en_UK/help/configuration.html
index d0bdd99ce..0241c88e2 100644
--- a/language/en_UK/help/configuration.html
+++ b/language/en_UK/help/configuration.html
@@ -96,7 +96,7 @@ users.</p>
 <ul>
 
   <li><strong>Language</strong>: apply to Piwigo
-  labels only. Category names, picture names and all descriptions fields are not
+  labels only. Album names, picture names and all descriptions fields are not
   localized.</li>
 
   <li><strong>Number of images per row</strong></li>
diff --git a/language/en_UK/help/maintenance.html b/language/en_UK/help/maintenance.html
index 040bad8aa..a39513348 100644
--- a/language/en_UK/help/maintenance.html
+++ b/language/en_UK/help/maintenance.html
@@ -24,7 +24,7 @@ information from database make you save disk space.</p>
 
 <ul>
 
-  <li><strong>Update categories informations:</strong> For each category,
+  <li><strong>Update albums informations:</strong> For each category,
   the following information is checked, and updated if necessary : list of parent
   categories, number of pictures, last picture date, position among
   brother categories, position among all categories. This action also checks