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

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

10 files changed, 28 insertions, 28 deletions

diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index 50fc21a29..34242fafe 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -111,7 +111,7 @@ UPDATE '.CATEGORIES_TABLE.' SET image_order='.(isset($image_order) ? 'NULL':'\''
     move_categories( array($_GET['cat_id']), $_POST['parent'] );
   }
 
-  array_push($page['infos'], l10n('Category informations updated successfully.'));
+  array_push($page['infos'], l10n('Album updated successfully'));
 }
 elseif (isset($_POST['set_random_representant']))
 {
@@ -154,7 +154,7 @@ elseif (isset($_POST['submitAdd']))
     array_push(
       $page['infos'],
       sprintf(
-        l10n('Category elements associated to the following categories: %s'),
+        l10n('Album elements associated to the following albums: %s'),
         '<ul><li>'
         .get_cat_display_name_from_id($output_create['id'])
         .'</li></ul>'
@@ -183,7 +183,7 @@ elseif (isset($_POST['submitDestinations'])
   array_push(
     $page['infos'],
     sprintf(
-      l10n('Category elements associated to the following categories: %s'),
+      l10n('Album elements associated to the following albums: %s'),
       '<ul><li>'.implode('</li><li>', $category_names).'</li></ul>'
       )
     );
@@ -273,7 +273,7 @@ if ('private' == $category['status'])
     );
 }
 
-// manage category elements link
+// manage album elements link
 if ($category['has_images'])
 {
   $template->assign(
diff --git a/admin/cat_move.php b/admin/cat_move.php
index 83f026d68..d33de8ff0 100644
--- a/admin/cat_move.php
+++ b/admin/cat_move.php
@@ -53,7 +53,7 @@ if (isset($_POST['submit']))
   {
     array_push(
       $page['errors'],
-      l10n('Select at least one category')
+      l10n('Select at least one album')
       );
   }
 }
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 5a65f9995..718fa7236 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -1062,7 +1062,7 @@ SELECT uppercats
       {
         array_push(
           $page['errors'],
-          l10n('You cannot move a category in its own sub category')
+          l10n('You cannot move a album in its own sub album')
           );
         return;
       }
@@ -1172,7 +1172,7 @@ function create_virtual_category($category_name, $parent_id=null)
   // is the given category name only containing blank spaces ?
   if (preg_match('/^\s*$/', $category_name))
   {
-    return array('error' => l10n('The name of a category should not be empty'));
+    return array('error' => l10n('The name of an album must not be empty'));
   }
 
   $parent_id = !empty($parent_id) ? $parent_id : 'NULL';
diff --git a/admin/themes/default/template/cat_list.tpl b/admin/themes/default/template/cat_list.tpl
index 4bb4dccfe..c7007c8b2 100644
--- a/admin/themes/default/template/cat_list.tpl
+++ b/admin/themes/default/template/cat_list.tpl
@@ -68,24 +68,24 @@
       <!-- category {$category.ID} -->
       <ul class="categoryActions">
         {if cat_admin_access($category.ID)}
-        <li><a href="{$category.U_JUMPTO}" title="{'jump to category'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to category'|@translate}"></a></li>
+        <li><a href="{$category.U_JUMPTO}" title="{'jump to album'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to album'|@translate}"></a></li>
         {/if}
         <li><a href="{$category.U_EDIT}" title="{'edit category informations'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_edit.png" class="button" alt="{'edit'|@translate}"></a></li>
         {if isset($category.U_MANAGE_ELEMENTS) }
-        <li><a href="{$category.U_MANAGE_ELEMENTS}" title="{'manage category elements'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}"></a></li>
+        <li><a href="{$category.U_MANAGE_ELEMENTS}" title="{'manage album elements'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}"></a></li>
         {/if}
-        <li><a href="{$category.U_CHILDREN}" title="{'manage sub-categories'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_children.png" class="button" alt="{'sub-categories'|@translate}"></a></li>
+        <li><a href="{$category.U_CHILDREN}" title="{'manage sub-albums'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_children.png" class="button" alt="{'sub-categories'|@translate}"></a></li>
         {if isset($category.U_MANAGE_PERMISSIONS) }
-        <li><a href="{$category.U_MANAGE_PERMISSIONS}" title="{'edit category permissions'|@translate}" ><img src="{$themeconf.admin_icon_dir}/category_permissions.png" class="button" alt="{'Permissions'|@translate}"></a></li>
+        <li><a href="{$category.U_MANAGE_PERMISSIONS}" title="{'edit album permissions'|@translate}" ><img src="{$themeconf.admin_icon_dir}/category_permissions.png" class="button" alt="{'Permissions'|@translate}"></a></li>
         {/if}
         {if isset($category.U_DELETE) }
-        <li><a href="{$category.U_DELETE}" title="{'delete category'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"><img src="{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'delete'|@translate}"></a></li>
+        <li><a href="{$category.U_DELETE}" title="{'delete album'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"><img src="{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'delete album'|@translate}"></a></li>
         {/if}
       </ul>
 
       <p>
       <img src="{$themeconf.admin_icon_dir}/cat_move.png" class="button drag_button" style="display:none;" alt="{'Drag to re-order'|@translate}" title="{'Drag to re-order'|@translate}">
-      <strong><a href="{$category.U_CHILDREN}" title="{'manage sub-categories'|@translate}">{$category.NAME}</a></strong>
+      <strong><a href="{$category.U_CHILDREN}" title="{'manage sub-albums'|@translate}">{$category.NAME}</a></strong>
       {if $category.IS_VIRTUAL}
       <img src="{$themeconf.admin_icon_dir}/virt_category.png" class="button" alt="{'Virtual category'|@translate}">
       {/if}
diff --git a/admin/themes/default/template/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl
index df21bbe82..2eac97f9a 100644
--- a/admin/themes/default/template/cat_modify.tpl
+++ b/admin/themes/default/template/cat_modify.tpl
@@ -10,18 +10,18 @@
 
 <ul class="categoryActions">
   {if cat_admin_access($CAT_ID)}
-  <li><a href="{$U_JUMPTO}" title="{'jump to category'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to category'|@translate}"></a></li>
+  <li><a href="{$U_JUMPTO}" title="{'jump to album'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to album'|@translate}"></a></li>
   {/if}
   {if isset($U_MANAGE_ELEMENTS) }
-  <li><a href="{$U_MANAGE_ELEMENTS}" title="{'elements'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}"></a></li>
+  <li><a href="{$U_MANAGE_ELEMENTS}" title="{'manage album elements'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}"></a></li>
   <li><a href="{$U_MANAGE_RANKS}" title="{'manage image ranks'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/ranks.png" class="button" alt="{'ranks'|@translate}"></a></li>
   {/if}
-  <li><a href="{$U_CHILDREN}" title="{'sub-categories'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_children.png" class="button" alt="{'sub-categories'|@translate}"></a></li>
+  <li><a href="{$U_CHILDREN}" title="{'manage sub-albums'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_children.png" class="button" alt="{'sub-categories'|@translate}"></a></li>
   {if isset($U_MANAGE_PERMISSIONS) }
-  <li><a href="{$U_MANAGE_PERMISSIONS}" title="{'Permissions'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_permissions.png" class="button" alt="{'Permissions'|@translate}"></a></li>
+  <li><a href="{$U_MANAGE_PERMISSIONS}" title="{'edit album permissions'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_permissions.png" class="button" alt="{'Permissions'|@translate}"></a></li>
   {/if}
   {if isset($U_DELETE) }
-  <li><a href="{$U_DELETE}" title="{'delete'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'delete'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"></a></li>
+  <li><a href="{$U_DELETE}" title="{'delete album'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'delete album'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"></a></li>
   {/if}
 </ul>
 
@@ -152,7 +152,7 @@
 <form action="{$F_ACTION}" method="POST" id="links">
 
 <fieldset id="linkAllNew">
-  <legend>{'Link all category elements to a new category'|@translate}</legend>
+  <legend>{'Link all album elements to a new album'|@translate}</legend>
 
   <table>
     <tr>
@@ -179,7 +179,7 @@
 </fieldset>
 
 <fieldset id="linkAllExist">
-  <legend>{'Link all category elements to some existing categories'|@translate}</legend>
+  <legend>{'Link all album elements to some existing albums'|@translate}</legend>
 
   <table>
     <tr>
diff --git a/admin/themes/default/template/cat_move.tpl b/admin/themes/default/template/cat_move.tpl
index 9f9d2732d..b42a71b2b 100644
--- a/admin/themes/default/template/cat_move.tpl
+++ b/admin/themes/default/template/cat_move.tpl
@@ -7,10 +7,10 @@
 
 <form method="post" action="{$F_ACTION}" class="filter" id="catMove">
   <fieldset>
-    <legend>{'Virtual categories movement'|@translate}</legend>
+    <legend>{'Move albums'|@translate}</legend>
 
     <label>
-      {'Virtual categories to move'|@translate}
+      {'Virtual albums to move'|@translate}
 
       <select class="categoryList" name="selection[]" multiple="multiple">
         {html_options options=$category_to_move_options}
diff --git a/admin/themes/default/template/cat_perm.tpl b/admin/themes/default/template/cat_perm.tpl
index fb239e79f..5f7e52780 100644
--- a/admin/themes/default/template/cat_perm.tpl
+++ b/admin/themes/default/template/cat_perm.tpl
@@ -1,5 +1,5 @@
 <div class="titrePage">
-  <h2>{'Manage permissions for a category'|@translate}</h2>
+  <h2>{'Edit album permissions'|@translate}</h2>
 </div>
 
 <h3>{$CATEGORIES_NAV}</h3>
diff --git a/admin/themes/default/template/element_set_global.tpl b/admin/themes/default/template/element_set_global.tpl
index b357cae54..73ec42f88 100644
--- a/admin/themes/default/template/element_set_global.tpl
+++ b/admin/themes/default/template/element_set_global.tpl
@@ -104,7 +104,7 @@
     <table>
 
       <tr>
-        <td>{'associate to category'|@translate}</td>
+        <td>{'Associate to album'|@translate}</td>
         <td>
           <select style="width:400px" name="associate" size="1">
             <option value="0">------------</option>
@@ -114,7 +114,7 @@
       </tr>
 
       <tr>
-        <td>{'dissociate from category'|@translate}</td>
+        <td>{'Dissociate from album'|@translate}</td>
         <td>
           <select style="width:400px" name="dissociate" size="1">
             <option value="0">------------</option>
diff --git a/admin/themes/default/template/maintenance.tpl b/admin/themes/default/template/maintenance.tpl
index 0ac001156..04339f4cb 100644
--- a/admin/themes/default/template/maintenance.tpl
+++ b/admin/themes/default/template/maintenance.tpl
@@ -9,7 +9,7 @@
 </ul>
 
 <ul>
-  <li><a href="{$U_MAINT_CATEGORIES}" {$TAG_INPUT_ENABLED}>{'Update categories informations'|@translate}</a></li>
+  <li><a href="{$U_MAINT_CATEGORIES}" {$TAG_INPUT_ENABLED}>{'Update albums informations'|@translate}</a></li>
   <li><a href="{$U_MAINT_IMAGES}" {$TAG_INPUT_ENABLED}>{'Update images informations'|@translate}</a></li>
   <li><a href="{$U_MAINT_DATABASE}" {$TAG_INPUT_ENABLED}>{'Repair and optimize database'|@translate}</a></li>
 </ul>
diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl
index 0d33d5823..2f45a1251 100644
--- a/admin/themes/default/template/photos_add_direct.tpl
+++ b/admin/themes/default/template/photos_add_direct.tpl
@@ -272,7 +272,7 @@ var sizeLimit = {$upload_max_filesize};
 
 <div id="formErrors" class="errors" style="display:none">
   <ul>
-    <li id="emptyCategoryName">{'The name of a category should not be empty'|@translate}</li>
+    <li id="emptyCategoryName">{'The name of an album must not be empty'|@translate}</li>
     <li id="noPhoto">{'Select at least one picture'|@translate}</li>
   </ul>
   <div class="hideButton" style="text-align:center"><a href="#" id="hideErrors">{'Hide'|@translate}</a></div>
@@ -306,7 +306,7 @@ var sizeLimit = {$upload_max_filesize};
             </td>
           </tr>
           <tr>
-            <td>{'Category name'|@translate}</td>
+            <td>{'Album name'|@translate}</td>
             <td>
               <input type="text" name="category_name" value="{$F_CATEGORY_NAME}" style="width:400px">
             </td>