From 5ff171684eec339ed83119eb57e124174c07d465 Mon Sep 17 00:00:00 2001 From: rvelices Date: Tue, 21 Sep 2010 21:14:54 +0000 Subject: feature 1616: rename "category" into "album" (4th commit; almost there) git-svn-id: http://piwigo.org/svn/trunk@6993 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/cat_list.php | 2 +- admin/cat_options.php | 6 +++--- admin/element_set.php | 2 +- admin/include/functions.php | 2 +- admin/include/functions_permalinks.php | 6 +++--- admin/maintenance.php | 2 +- admin/photos_add_direct.php | 6 +++--- admin/themes/default/template/admin.tpl | 2 +- admin/themes/default/template/cat_list.tpl | 4 ++-- admin/themes/default/template/cat_modify.tpl | 4 ++-- admin/themes/default/template/configuration.tpl | 2 +- admin/themes/default/template/group_perm.tpl | 2 +- admin/themes/default/template/history.tpl | 2 +- admin/themes/default/template/permalinks.tpl | 6 +++--- admin/themes/default/template/photos_add_direct.tpl | 6 +++--- admin/themes/default/template/picture_modify.tpl | 4 ++-- admin/themes/default/template/site_manager.tpl | 2 +- admin/themes/default/template/site_update.tpl | 8 ++++---- admin/themes/default/template/upload.tpl | 2 +- admin/themes/default/template/user_perm.tpl | 4 ++-- 20 files changed, 37 insertions(+), 37 deletions(-) (limited to 'admin') diff --git a/admin/cat_list.php b/admin/cat_list.php index 0ee142771..dd79287bd 100644 --- a/admin/cat_list.php +++ b/admin/cat_list.php @@ -190,7 +190,7 @@ SELECT id, name, id_uppercat array_push( $page['infos'], - l10n('Categories automatically sorted') + l10n('Albums automatically sorted') ); } } diff --git a/admin/cat_options.php b/admin/cat_options.php index 1561206d4..638757cb0 100644 --- a/admin/cat_options.php +++ b/admin/cat_options.php @@ -211,7 +211,7 @@ SELECT id,name,uppercats,global_rank ;'; $template->assign( array( - 'L_SECTION' => l10n('Select uploadable categories'), + 'L_SECTION' => l10n('Select uploadable albums'), 'L_CAT_OPTIONS_TRUE' => l10n('Authorized'), 'L_CAT_OPTIONS_FALSE' => l10n('Forbidden'), ) @@ -232,7 +232,7 @@ SELECT id,name,uppercats,global_rank ;'; $template->assign( array( - 'L_SECTION' => l10n('Authorize users to add comments on selected categories'), + 'L_SECTION' => l10n('Authorize users to add comments on selected albums'), 'L_CAT_OPTIONS_TRUE' => l10n('Authorized'), 'L_CAT_OPTIONS_FALSE' => l10n('Forbidden'), ) @@ -274,7 +274,7 @@ SELECT id,name,uppercats,global_rank ;'; $template->assign( array( - 'L_SECTION' => l10n('Manage authorizations for selected categories'), + 'L_SECTION' => l10n('Manage authorizations for selected albums'), 'L_CAT_OPTIONS_TRUE' => l10n('Public'), 'L_CAT_OPTIONS_FALSE' => l10n('Private'), ) diff --git a/admin/element_set.php b/admin/element_set.php index 58113861d..11bbcb2ac 100644 --- a/admin/element_set.php +++ b/admin/element_set.php @@ -166,7 +166,7 @@ SELECT DISTINCT(image_id) } else if ('duplicates' == $_GET['cat']) { - $page['title'] = l10n('Files with same name in more than one physical category'); + $page['title'] = l10n('Files with same name in more than one physical album'); $template->assign(array('U_ACTIVE_MENU' => 5 )); // we are searching related elements twice or more to physical categories diff --git a/admin/include/functions.php b/admin/include/functions.php index 718fa7236..d8aade68d 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 album in its own sub album') + l10n('You cannot move an album in its own sub album') ); return; } diff --git a/admin/include/functions_permalinks.php b/admin/include/functions_permalinks.php index 4073970fd..579f5f159 100644 --- a/admin/include/functions_permalinks.php +++ b/admin/include/functions_permalinks.php @@ -87,7 +87,7 @@ SELECT permalink { $page['errors'][] = sprintf( - l10n('Permalink %s has been previously used by category %s. Delete from the permalink history first'), + l10n('Permalink %s has been previously used by album %s. Delete from the permalink history first'), $permalink, $old_cat_id ); return false; @@ -156,7 +156,7 @@ function set_cat_permalink( $cat_id, $permalink, $save ) { $page['errors'][] = sprintf( - l10n('Permalink %s is already used by category %s'), + l10n('Permalink %s is already used by album %s'), $permalink, $existing_cat_id ); return false; @@ -169,7 +169,7 @@ function set_cat_permalink( $cat_id, $permalink, $save ) { $page['errors'][] = sprintf( - l10n('Permalink %s has been previously used by category %s. Delete from the permalink history first'), + l10n('Permalink %s has been previously used by album %s. Delete from the permalink history first'), $permalink, $old_cat_id ); return false; diff --git a/admin/maintenance.php b/admin/maintenance.php index 586bc3d4c..06b80862f 100644 --- a/admin/maintenance.php +++ b/admin/maintenance.php @@ -161,7 +161,7 @@ array_push( array_push( $advanced_features, array( - 'CAPTION' => l10n('Files with same name in more than one physical category'), + 'CAPTION' => l10n('Files with same name in more than one physical album'), 'URL' => get_root_url().'admin.php?page=element_set&cat=duplicates' ) ); diff --git a/admin/photos_add_direct.php b/admin/photos_add_direct.php index d12d8971d..727045c6a 100644 --- a/admin/photos_add_direct.php +++ b/admin/photos_add_direct.php @@ -112,7 +112,7 @@ if (isset($_GET['processed'])) array_push( $page['infos'], sprintf( - l10n('Category "%s" has been added'), + l10n('Album "%s" has been added'), ''.$category_name.'' ) ); @@ -346,7 +346,7 @@ SELECT array_push( $page['infos'], sprintf( - l10n('Category "%s" now contains %d photos'), + l10n('Album "%s" now contains %d photos'), ''.$category_name.'', $count ) @@ -457,7 +457,7 @@ if (pwg_db_num_rows($result) > 0) } } -// existing category +// existing album $query = ' SELECT id,name,uppercats,global_rank FROM '.CATEGORIES_TABLE.' diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl index 39c8f7c9d..1e2b2f88e 100644 --- a/admin/themes/default/template/admin.tpl +++ b/admin/themes/default/template/admin.tpl @@ -31,7 +31,7 @@ jQuery().ready(function(){ldelim}
-
{'Categories'|@translate} 
+
{'Albums'|@translate} 
  • {'Manage'|@translate}
    • diff --git a/admin/themes/default/template/cat_list.tpl b/admin/themes/default/template/cat_list.tpl index c7007c8b2..8675e2879 100644 --- a/admin/themes/default/template/cat_list.tpl +++ b/admin/themes/default/template/cat_list.tpl @@ -28,7 +28,7 @@ }); -

    {'Categories management'|@translate}

    +

    {'Album list management'|@translate}

    {$CATEGORIES_NAV}

    @@ -70,7 +70,7 @@ {if cat_admin_access($category.ID)}
  • {'jump to album'|@translate}
    • {/if} -
  • {'edit'|@translate}
    • +
  • {'edit'|@translate}
    • {if isset($category.U_MANAGE_ELEMENTS) }
  • {'elements'|@translate}
    • {/if} diff --git a/admin/themes/default/template/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl index 2eac97f9a..250455608 100644 --- a/admin/themes/default/template/cat_modify.tpl +++ b/admin/themes/default/template/cat_modify.tpl @@ -3,7 +3,7 @@ {include file='include/resize.inc.tpl'}
    -

    {'Edit a category'|@translate}

    +

    {'Edit album'|@translate}

    {$CATEGORIES_NAV}

    @@ -183,7 +183,7 @@ - + - + {if !empty($search_results) } diff --git a/admin/themes/default/template/permalinks.tpl b/admin/themes/default/template/permalinks.tpl index e7674c7c2..48c4de79b 100644 --- a/admin/themes/default/template/permalinks.tpl +++ b/admin/themes/default/template/permalinks.tpl @@ -4,7 +4,7 @@
    {'Add/delete a permalink'|@translate} -
    {'Categories'|@translate}{'Albums'|@translate} diff --git a/admin/themes/default/template/group_perm.tpl b/admin/themes/default/template/group_perm.tpl index 1dded1291..401012d1e 100644 --- a/admin/themes/default/template/group_perm.tpl +++ b/admin/themes/default/template/group_perm.tpl @@ -5,4 +5,4 @@ {$DOUBLE_SELECT} -

    {'Only private categories are listed'|@translate}

    +

    {'Only private albums are listed'|@translate}

    diff --git a/admin/themes/default/template/history.tpl b/admin/themes/default/template/history.tpl index 00d179e7b..bca98b75e 100644 --- a/admin/themes/default/template/history.tpl +++ b/admin/themes/default/template/history.tpl @@ -112,7 +112,7 @@     		{'Element'|@translate} {'Element type'|@translate} {'Section'|@translate}{'Category'|@translate}{'Album'|@translate} {'Tags'|@translate}
    - + {foreach from=$permalinks item=permalink name="permalink_loop"} @@ -45,7 +45,7 @@
    Id {$SORT_ID}{'Category'|@translate} {$SORT_NAME}{'Album'|@translate} {$SORT_NAME} {'Permalink'|@translate} {$SORT_PERMALINK}
    - + diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl index 2f45a1251..f737c540c 100644 --- a/admin/themes/default/template/photos_add_direct.tpl +++ b/admin/themes/default/template/photos_add_direct.tpl @@ -280,13 +280,13 @@ var sizeLimit = {$upload_max_filesize};
    - {'Drop into category'|@translate} + {'Drop into album'|@translate} {if $upload_mode eq 'multiple'} {/if} - - + +
    Id {$SORT_OLD_CAT_ID}{'Category'|@translate}{'Album'|@translate} {'Permalink'|@translate} {$SORT_OLD_PERMALINK} {'Deleted on'|@translate} {$SORT_OLD_DATE_DELETED} {'Last hit'|@translate} {$SORT_OLD_LAST_HIT}
    @@ -200,7 +200,7 @@
    - {'Representation of categories'|@translate} + {'Representation of albums'|@translate}
    diff --git a/admin/themes/default/template/site_manager.tpl b/admin/themes/default/template/site_manager.tpl index 4b02184fc..dc08b9ae8 100644 --- a/admin/themes/default/template/site_manager.tpl +++ b/admin/themes/default/template/site_manager.tpl @@ -39,7 +39,7 @@ {foreach from=$sites item=site name=site}
    - {$site.NAME}
    ({$site.TYPE}, {$site.CATEGORIES} {'Categories'|@translate}, {$pwg->l10n_dec('%d image','%d images',$site.IMAGES)}) + {$site.NAME}
    ({$site.TYPE}, {$site.CATEGORIES} {'Albums'|@translate}, {$pwg->l10n_dec('%d image','%d images',$site.IMAGES)})     		[{'synchronize'|@translate}] {if isset($site.U_DELETE)} diff --git a/admin/themes/default/template/site_update.tpl b/admin/themes/default/template/site_update.tpl index 0839eb1cc..ae47525fd 100644 --- a/admin/themes/default/template/site_update.tpl +++ b/admin/themes/default/template/site_update.tpl @@ -8,9 +8,9 @@ {if isset($update_result)}

    {$L_RESULT_UPDATE}

      -
    • {$update_result.NB_NEW_CATEGORIES} {'categories added in the database'|@translate}
      • +
    • {$update_result.NB_NEW_CATEGORIES} {'albums added in the database'|@translate}
    • {$update_result.NB_NEW_ELEMENTS} {'elements added in the database'|@translate}
      • -
    • {$update_result.NB_DEL_CATEGORIES} {'categories deleted in the database'|@translate}
      • +
    • {$update_result.NB_DEL_CATEGORIES} {'albums deleted in the database'|@translate}
    • {$update_result.NB_DEL_ELEMENTS} {'elements deleted in the database'|@translate}
    • {$update_result.NB_UPD_ELEMENTS} {'elements updated in the database'|@translate}
    • {$update_result.NB_ERRORS} {'errors during synchronization'|@translate}
      • @@ -67,7 +67,7 @@
      • -
        • +
      @@ -94,7 +94,7 @@
      - {'reduce to single existing categories'|@translate} + {'reduce to single existing albums'|@translate}
      • - + diff --git a/admin/themes/default/template/user_perm.tpl b/admin/themes/default/template/user_perm.tpl index d1ecdca9a..031ab7000 100644 --- a/admin/themes/default/template/user_perm.tpl +++ b/admin/themes/default/template/user_perm.tpl @@ -2,7 +2,7 @@ {if isset($categories_because_of_groups) }
        - {'Categories authorized thanks to group associations'|@translate} + {'Albums authorized thanks to group associations'|@translate}
          {foreach from=$categories_because_of_groups item=cat } @@ -14,7 +14,7 @@
          - {'Other private categories'|@translate} + {'Other private albums'|@translate} {$DOUBLE_SELECT} -- cgit v1.2.3
        {'Category'|@translate}{'Album'|@translate} {'Date'|@translate} {'File'|@translate} {'Thumbnail'|@translate}