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

9 files changed, 18 insertions, 18 deletions

diff --git a/admin/cat_list.php b/admin/cat_list.php
index 7afc21db4..0ee142771 100644
--- a/admin/cat_list.php
+++ b/admin/cat_list.php
@@ -106,7 +106,7 @@ $navigation.= '</a>';
 if (isset($_GET['delete']) and is_numeric($_GET['delete']) and !is_adviser())
 {
   delete_categories(array($_GET['delete']));
-  array_push($page['infos'], l10n('Virtual category deleted'));
+  array_push($page['infos'], l10n('Virtual album deleted'));
   update_global_rank();
   redirect(get_root_url().'admin.php?page=cat_list');
 }
@@ -137,7 +137,7 @@ else if (isset($_POST['submitOrder']))
 
     array_push(
       $page['infos'],
-      l10n('Categories manual order was saved')
+      l10n('Album manual order was saved')
       );
   }
   else
diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index f058d0f73..50fc21a29 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -139,7 +139,7 @@ elseif (isset($_POST['submitAdd']))
   }
   else
   {
-    // Virtual category creation succeeded
+    // Virtual album creation succeeded
     //
     // Add the information in the information list
     array_push($page['infos'], $output_create['info']);
diff --git a/admin/cat_options.php b/admin/cat_options.php
index b36083c49..1561206d4 100644
--- a/admin/cat_options.php
+++ b/admin/cat_options.php
@@ -253,7 +253,7 @@ SELECT id,name,uppercats,global_rank
 ;';
     $template->assign(
       array(
-        'L_SECTION' => l10n('Lock categories'),
+        'L_SECTION' => l10n('Lock albums'),
         'L_CAT_OPTIONS_TRUE' => l10n('Unlocked'),
         'L_CAT_OPTIONS_FALSE' => l10n('Locked'),
         )
@@ -275,8 +275,8 @@ SELECT id,name,uppercats,global_rank
     $template->assign(
       array(
         'L_SECTION' => l10n('Manage authorizations for selected categories'),
-        'L_CAT_OPTIONS_TRUE' => l10n('Public category'),
-        'L_CAT_OPTIONS_FALSE' => l10n('Private category'),
+        'L_CAT_OPTIONS_TRUE' => l10n('Public'),
+        'L_CAT_OPTIONS_FALSE' => l10n('Private'),
         )
       );
     break;
diff --git a/admin/include/functions.php b/admin/include/functions.php
index e74263318..5a65f9995 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -1258,7 +1258,7 @@ UPDATE
   pwg_query($query);
 
   return array(
-    'info' => l10n('Virtual category added'),
+    'info' => l10n('Virtual album added'),
     'id'   => $inserted_id,
     );
 }
diff --git a/admin/themes/default/template/cat_list.tpl b/admin/themes/default/template/cat_list.tpl
index 69e599502..4bb4dccfe 100644
--- a/admin/themes/default/template/cat_list.tpl
+++ b/admin/themes/default/template/cat_list.tpl
@@ -35,7 +35,7 @@
 <form id="addVirtual" action="{$F_ACTION}" method="post">
   <p>
     <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
-    {'Add a virtual category'|@translate} : <input type="text" name="virtual_name">
+    {'Add a virtual album'|@translate} : <input type="text" name="virtual_name">
     <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitAdd" {$TAG_INPUT_ENABLED}>
     {if count($categories)>9 }
     <a href="#EoP" class="button" style="border:0;">
@@ -57,7 +57,7 @@
         <option value="asc">{'ascending'|@translate}</option>
         <option value="desc">{'descending'|@translate}</option>
       </select>
-      <label><input type="checkbox" name="recursive"> {'apply to sub-categories'|@translate}</label>
+      <label><input type="checkbox" name="recursive"> {'Apply to sub-albums'|@translate}</label>
     </span>
   </div>
 
diff --git a/admin/themes/default/template/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl
index e76650d8c..df21bbe82 100644
--- a/admin/themes/default/template/cat_modify.tpl
+++ b/admin/themes/default/template/cat_modify.tpl
@@ -56,7 +56,7 @@
 {if isset($move_cat_options) }
 <fieldset id="move">
   <legend>{'Move'|@translate}</legend>
-  {'Parent category'|@translate}
+  {'Parent album'|@translate}
   <select class="categoryDropDown" name="parent">
     <option value="0">------------</option>
     {html_options options=$move_cat_options selected=$move_cat_options_selected }
@@ -102,7 +102,7 @@
   <label for="image_order_default">{'Use the default image sort order (defined in the configuration file)'|@translate}</label>
   <br>
   <input type="checkbox" name="image_order_subcats" id="image_order_subcats">
-  <label for="image_order_subcats">{'Apply to subcategories'|@translate}</label>
+  <label for="image_order_subcats">{'Apply to sub-albums'|@translate}</label>
   <br>
   
   {foreach from=$image_orders item=order}
@@ -156,12 +156,12 @@
 
   <table>
     <tr>
-      <td>{'Virtual category name'|@translate}</td>
+      <td>{'Virtual album name'|@translate}</td>
       <td><input type="text" class="large" name="virtual_name"></td>
     </tr>
 
     <tr>
-      <td>{'Parent category'|@translate}</td>
+      <td>{'Parent album'|@translate}</td>
       <td>
         <select class="categoryDropDown" name="parent">
           <option value="0">------------</option>
diff --git a/admin/themes/default/template/cat_move.tpl b/admin/themes/default/template/cat_move.tpl
index f8a83c584..9f9d2732d 100644
--- a/admin/themes/default/template/cat_move.tpl
+++ b/admin/themes/default/template/cat_move.tpl
@@ -2,7 +2,7 @@
 {include file='include/resize.inc.tpl'}
 
 <div class="titrePage">
-  <h2>{'Move categories'|@translate}</h2>
+  <h2>{'Move albums'|@translate}</h2>
 </div>
 
 <form method="post" action="{$F_ACTION}" class="filter" id="catMove">
@@ -18,7 +18,7 @@
     </label>
 
     <label>
-      {'New parent category'|@translate}
+      {'New parent album'|@translate}
 
       <select class="categoryDropDown" name="parent">
         <option value="0">------------</option>
diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl
index b1c9e1b7b..0d33d5823 100644
--- a/admin/themes/default/template/photos_add_direct.tpl
+++ b/admin/themes/default/template/photos_add_direct.tpl
@@ -297,7 +297,7 @@ var sizeLimit = {$upload_max_filesize};
       <div id="category_type_new" class="category_selection">
         <table>
           <tr>
-            <td>{'Parent category'|@translate}</td>
+            <td>{'Parent album'|@translate}</td>
             <td>
               <select class="categoryDropDown" name="category_parent">
                 <option value="0">------------</option>
diff --git a/admin/themes/default/template/picture_modify.tpl b/admin/themes/default/template/picture_modify.tpl
index 4681c922b..09496f757 100644
--- a/admin/themes/default/template/picture_modify.tpl
+++ b/admin/themes/default/template/picture_modify.tpl
@@ -74,13 +74,13 @@
 {/if}
 
       <tr>
-        <td><strong>{'Storage category'|@translate}</strong></td>
+        <td><strong>{'Storage album'|@translate}</strong></td>
         <td>{$STORAGE_CATEGORY}</td>
       </tr>
 
       {if isset($related_categories) }
       <tr>
-        <td><strong>{'Linked categories'|@translate}</strong></td>
+        <td><strong>{'Linked albums'|@translate}</strong></td>
         <td>
           <ul>
             {foreach from=$related_categories item=name}