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

8 files changed, 8 insertions, 8 deletions

diff --git a/admin/include/functions.php b/admin/include/functions.php
index d169dfb80..e74263318 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -1152,7 +1152,7 @@ DELETE FROM '.$table.'
   array_push(
     $page['infos'],
     l10n_dec(
-      '%d category moved', '%d categories moved',
+      '%d album moved', '%d albums moved',
       count($categories)
       )
     );
diff --git a/admin/intro.php b/admin/intro.php
index 112d33fe1..3908891d9 100644
--- a/admin/intro.php
+++ b/admin/intro.php
@@ -200,7 +200,7 @@ $template->assign(
     'DB_VERSION' => $db_version,
     'DB_ELEMENTS' => l10n_dec('%d image', '%d images', $nb_elements),
     'DB_CATEGORIES' =>
-      l10n_dec('%d category including', '%d categories including',
+      l10n_dec('%d album including', '%d albums including',
         $nb_categories).
       l10n_dec('%d physical', '%d physical',
         $nb_physical).
diff --git a/admin/site_update.php b/admin/site_update.php
index c6cc69f03..512a292b7 100644
--- a/admin/site_update.php
+++ b/admin/site_update.php
@@ -218,7 +218,7 @@ SELECT id_uppercat, MAX(rank)+1 AS next_rank
   {
     array_push($fs_fulldirs, $basedir);
   }
-  // If $_POST['subcats-included'] != 1 ("Search in subcategories" is unchecked)
+  // If $_POST['subcats-included'] != 1 ("Search in sub-albums" is unchecked)
   // $db_fulldirs doesn't include any subdirectories and $fs_fulldirs does
   // So $fs_fulldirs will be limited to the selected basedir
   // (if that one is in $fs_fulldirs)
diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl
index 95fe21388..00b53a13e 100644
--- a/admin/themes/default/template/configuration.tpl
+++ b/admin/themes/default/template/configuration.tpl
@@ -227,7 +227,7 @@
 
     <li>
       <label>
-        <span class="property">{'display all elements in all sub-categories'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}</span>
+        <span class="property">{'display all elements in all sub-albums'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}</span>
         <input type="checkbox" name="index_flat_icon" {if ($display.index_flat_icon)}checked="checked"{/if}>
       </label>
     </li>
diff --git a/admin/themes/default/template/element_set_ranks.tpl b/admin/themes/default/template/element_set_ranks.tpl
index 804d053ff..8fe143eec 100644
--- a/admin/themes/default/template/element_set_ranks.tpl
+++ b/admin/themes/default/template/element_set_ranks.tpl
@@ -78,5 +78,5 @@
 
 
 {else}
-<div class="infos"><p>{'No element in this category'|@translate}</p></div>
+<div class="infos"><p>{'No element in this album'|@translate}</p></div>
 {/if}
diff --git a/admin/themes/default/template/profile_content.tpl b/admin/themes/default/template/profile_content.tpl
index 6b42863ad..643ef205a 100644
--- a/admin/themes/default/template/profile_content.tpl
+++ b/admin/themes/default/template/profile_content.tpl
@@ -76,7 +76,7 @@
         <input type="text" size="3" maxlength="2" name="recent_period" id="recent_period" value="{$RECENT_PERIOD}">
       </li>
       <li>
-        <span class="property">{'Expand all categories'|@translate}</span>
+        <span class="property">{'Expand all albums'|@translate}</span>
         {html_radios name='expand' options=$radio_options selected=$EXPAND}
       </li>
       <li>
diff --git a/admin/themes/default/template/site_update.tpl b/admin/themes/default/template/site_update.tpl
index b13c1ffc8..0839eb1cc 100644
--- a/admin/themes/default/template/site_update.tpl
+++ b/admin/themes/default/template/site_update.tpl
@@ -102,7 +102,7 @@
     </select>
     </li>
 
-    <li><label><input type="checkbox" name="subcats-included" value="1" {if $introduction.subcats_included}checked="checked"{/if}> {'Search in subcategories'|@translate}</label></li>
+    <li><label><input type="checkbox" name="subcats-included" value="1" {if $introduction.subcats_included}checked="checked"{/if}> {'Search in sub-albums'|@translate}</label></li>
     </ul>
   </fieldset>
 
diff --git a/admin/themes/default/template/user_list.tpl b/admin/themes/default/template/user_list.tpl
index 692e55fb8..f8442ec12 100644
--- a/admin/themes/default/template/user_list.tpl
+++ b/admin/themes/default/template/user_list.tpl
@@ -248,7 +248,7 @@
   </tr>
 
   <tr>
-    <td>{'Expand all categories'|@translate}</td>
+    <td>{'Expand all albums'|@translate}</td>
     <td>
       <label><input type="radio" name="expand" value="leave" checked="checked"> {'leave'|@translate}</label>
       / {'set to'|@translate}