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

5 files changed, 11 insertions, 11 deletions

diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 694785bb8..c6361bce0 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -70,7 +70,7 @@ $conf['order_by'] = ' ORDER BY date_available DESC, file ASC, id ASC';
 // #image_category.rank column
 //
 // $conf['order_by_inside_category'] = ' ORDER BY rank';
-// will sort images by the manually defined rank of images in this category.
+// will sort images by the manually defined rank of images in this album.
 $conf['order_by_inside_category'] = $conf['order_by'];
 
 // file_ext : file extensions (case sensitive) authorized
@@ -785,4 +785,4 @@ $conf['ploader_download_linux'] = 'http://piwigo.org/ext/download.php?eid=269';
 
 // enable the synchronization method for adding photos
 $conf['enable_synchronization'] = true;
-?>
+?>
\ No newline at end of file
diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php
index 7c4634c3f..f0e1f63c9 100644
--- a/include/functions_category.inc.php
+++ b/include/functions_category.inc.php
@@ -483,12 +483,12 @@ function get_display_images_count($cat_nb_images, $cat_count_images, $cat_count_
       //no descendant categories or descendants do not contain images
       if (! $short_message)
       {
-        $display_text.= ' '.l10n('in this category');
+        $display_text.= ' '.l10n('in this album');
       }
     }
     else
     {
-      $display_text.= ' '.l10n_dec('in %d sub-category', 'in %d sub-categories', $cat_count_categories);
+      $display_text.= ' '.l10n_dec('in %d sub-album', 'in %d sub-albums', $cat_count_categories);
     }
   }
 
diff --git a/include/functions_notification.inc.php b/include/functions_notification.inc.php
index 4f5f20e80..a89eb11f9 100644
--- a/include/functions_notification.inc.php
+++ b/include/functions_notification.inc.php
@@ -436,7 +436,7 @@ function news($start, $end, $exclude_img_cats=false, $add_url=false)
   if (!$exclude_img_cats)
   {
     add_news_line( $news,
-      nb_updated_categories($start, $end), '%d category updated', '%d categories updated',
+      nb_updated_categories($start, $end), '%d album updated', '%d albums updated',
       make_index_url(array('section'=>'recent_cats')), $add_url );
   }
 
@@ -585,7 +585,7 @@ function get_html_description_recent_post_date($date_detail)
 
   $description .=
         '<li>'
-        .l10n_dec('%d category updated', '%d categories updated',
+        .l10n_dec('%d album updated', '%d albums updated',
                   $date_detail['nb_cats'])
         .'</li>';
 
@@ -635,4 +635,4 @@ if(!function_exists("strptime"))
 			return $res;
 		}
  }
-?>
+?>
\ No newline at end of file
diff --git a/include/menubar.inc.php b/include/menubar.inc.php
index 133aab6ec..d341b6494 100644
--- a/include/menubar.inc.php
+++ b/include/menubar.inc.php
@@ -208,8 +208,8 @@ function initialize_menu()
     $block->data['recent_cats'] =
       array(
         'URL' => make_index_url(array('section' => 'recent_cats')),
-        'TITLE' => l10n('display recently updated categories'),
-        'NAME' => l10n('Recent categories'),
+        'TITLE' => l10n('display recently updated albums'),
+        'NAME' => l10n('Recent albums'),
       );
 
 
@@ -324,4 +324,4 @@ function initialize_menu()
   }
   $menu->apply('MENUBAR',  'menubar.tpl' );
 }
-?>
+?>
\ No newline at end of file
diff --git a/include/section_init.inc.php b/include/section_init.inc.php
index 38536ba90..03acb12bd 100644
--- a/include/section_init.inc.php
+++ b/include/section_init.inc.php
@@ -468,7 +468,7 @@ SELECT DISTINCT(id)
     $page = array_merge(
       $page,
       array(
-        'title' => l10n('Recent categories'),
+        'title' => l10n('Recent albums'),
         )
       );
   }