Skip to content

Commit

Permalink
feature 1616: rename "category" into "album" (second commit; still to…
Browse files Browse the repository at this point in the history 
… come)

git-svn-id: http://piwigo.org/svn/trunk@6969 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information
rvelices committed Sep 19, 2010
1 parent c206a73 commit 7907d31
Show file tree
Hide file tree
Showing 32 changed files with 315 additions and 317 deletions.
4 changes: 2 additions & 2 deletions admin/cat_list.php
View file
Expand Up @@ -106,7 +106,7 @@ function save_categories_order($categories)
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');
}
Expand Down Expand Up @@ -137,7 +137,7 @@ function save_categories_order($categories)

array_push(
$page['infos'],
l10n('Categories manual order was saved')
l10n('Album manual order was saved')
);
}
else
Expand Down
2 changes: 1 addition & 1 deletion admin/cat_modify.php
View file
Expand Up @@ -139,7 +139,7 @@
}
else
{
// Virtual category creation succeeded
// Virtual album creation succeeded
//
// Add the information in the information list
array_push($page['infos'], $output_create['info']);
Expand Down
6 changes: 3 additions & 3 deletions admin/cat_options.php
View file
Expand Up @@ -253,7 +253,7 @@
;';
$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'),
)
Expand All @@ -275,8 +275,8 @@
$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;
Expand Down
2 changes: 1 addition & 1 deletion admin/include/functions.php
View file
Expand Up @@ -1258,7 +1258,7 @@ function create_virtual_category($category_name, $parent_id=null)
pwg_query($query);

return array(
'info' => l10n('Virtual category added'),
'info' => l10n('Virtual album added'),
'id' => $inserted_id,
);
}
Expand Down
4 changes: 2 additions & 2 deletions admin/themes/default/template/cat_list.tpl
View file
Expand Up @@ -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;">
Expand All @@ -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>

Expand Down
8 changes: 4 additions & 4 deletions admin/themes/default/template/cat_modify.tpl
View file
Expand Up @@ -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 }
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions admin/themes/default/template/cat_move.tpl
View file
Expand Up @@ -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">
Expand All @@ -18,7 +18,7 @@
</label>

<label>
{'New parent category'|@translate}
{'New parent album'|@translate}

<select class="categoryDropDown" name="parent">
<option value="0">------------</option>
Expand Down
2 changes: 1 addition & 1 deletion admin/themes/default/template/photos_add_direct.tpl
View file
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions admin/themes/default/template/picture_modify.tpl
View file
Expand Up @@ -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}
Expand Down
28 changes: 14 additions & 14 deletions language/ar_SA/admin.lang.php
View file
Expand Up @@ -57,14 +57,14 @@
$lang['Add selected elements to caddie'] = 'اضافة المحدد الي السلة';
$lang['Add'] = 'أضف';
$lang['Allow user registration'] = 'السماح للمستخدمين بالتسجيل';
$lang['Apply to subcategories'] = 'التطبيق على الألبوم الفرعي';
$lang['Apply to sub-albums'] = 'التطبيق على الألبوم الفرعي';
$lang['Associated'] = 'مرتبط';
$lang['Association to categories'] = 'الربط الي الألبومات';
$lang['Batch management'] = 'ادارة التحويل';
$lang['Caddie management'] = 'ادارة السلة';
$lang['Caddie'] = 'السلة';
$lang['Categories authorized thanks to group associations'] = 'تم المصادقة عى الألبومات ، شكرا لله';
$lang['Categories manual order was saved'] = 'طلب الألبومات اليدوية تم حفظه';
$lang['Album manual order was saved'] = 'طلب الألبومات اليدوية تم حفظه';
$lang['Category elements associated to the following categories: %s'] = 'تنصيف العناصر المرتبطة الى الفئات التالية: %s';
$lang['Check for upgrade failed for unknown reasons.'] = 'لم يتم التحدث لاسباب غير معروفه.';
$lang['Check for upgrade'] = 'التأكد من التحديثات';
Expand Down Expand Up @@ -105,7 +105,7 @@
$lang['Install'] = 'تثبيت';
$lang['Link all category elements to a new category'] = 'اربط جميع عناصر الألبومات بالألبوم الجديد';
$lang['Link all category elements to some existing categories'] = 'اربط جميع عناصر الألبوم للقائمة الألبومات المشابهه';
$lang['Linked categories'] = 'ربط الألبومات';
$lang['Linked albums'] = 'ربط الألبومات';
$lang['Lock gallery'] = 'اغلاق المعرض';
$lang['Maintenance'] = 'صيانة';
$lang['Manage permissions for a category'] = 'ادراة تصاريح الألبومات';
Expand All @@ -114,11 +114,11 @@
$lang['Manage tags'] = 'ادارة الكلمات الدلائلية';
$lang['Members'] = 'الاعضاء';
$lang['Metadata synchronized from file'] = 'تزامن البيانات الوصفية للملف';
$lang['Move categories'] = 'نقل الألبومات';
$lang['Move albums'] = 'نقل الألبومات';
$lang['Move'] = 'نقل';
$lang['Name'] = 'الاسم';
$lang['New name'] = 'اسم جديد';
$lang['New parent category'] = 'ألبوم فرعي جديد';
$lang['New parent album'] = 'ألبوم فرعي جديد';
$lang['New tag'] = 'كلمة جديد';
$lang['Number of comments per page'] = 'عدد التلعيقات في الصفحة';
$lang['Number of rates'] = 'عدد التقيمات';
Expand All @@ -128,7 +128,7 @@
$lang['Options'] = 'الخيارات';
$lang['Other private categories'] = 'ألبومات أخرى مدرجة';
$lang['Page banner'] = 'عنوان المعرض ( أعلى الصفحة) يمكنك استخدام HTML';
$lang['Parent category'] = 'الألبوم الرئيسي';
$lang['Parent album'] = 'الألبوم الرئيسي';
$lang['Path'] = 'مسار';
$lang['Permalink'] = 'رابط دائم';
$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'الرابط الدائم %sكان يستخدم من قبل الألبوم سابقا أحذفه اولا من تاريخ %sالرابط الدائم';
Expand Down Expand Up @@ -163,7 +163,7 @@
$lang['Site manager'] = 'إدارة الموقع';
$lang['Status'] = 'الحالة';
$lang['Statistics'] = 'الأحصائيات';
$lang['Storage category'] = 'مخزن الألبومات';
$lang['Storage album'] = 'مخزن الألبومات';
$lang['Sum of rates'] = 'مجموع التييم';
$lang['Tag "%s" already exists'] = 'الكلمات "%s" موجودة بالفعل';
$lang['Tag "%s" was added'] = 'تم اضافة هذه الكلمة "%s"';
Expand All @@ -181,7 +181,7 @@
$lang['Version'] = 'الاصدار';
$lang['Virtual categories movement'] = 'نقل الألبومات';
$lang['Virtual categories to move'] = 'لنقل الألبومات';
$lang['Virtual category name'] = 'أسم الألبوم';
$lang['Virtual album name'] = 'أسم الألبوم';
$lang['Webmaster cannot be deleted'] = 'لا يمكنك حذف مدير الموقع';
$lang['You are running on development sources, no check possible.'] = 'ربما لا يمكن تطوير المصادر';
$lang['You cannot delete your account'] = "لا تستطيع حذف حسابك";
Expand All @@ -192,18 +192,18 @@
$lang['associate to category'] = 'المرتبط بهذا الألبوم';
$lang['associate to group'] = 'مرتبط بهذه المجموعه';
$lang['Authorized'] = 'المرخص';
$lang['Add a virtual category'] = 'انشاء ألبوم';
$lang['Add a virtual album'] = 'انشاء ألبوم';
$lang['Authorize users to add comments on selected categories'] = 'السماح للمستخدمين باضافة تعليق على ألبومات معينة';
$lang['The name of a category should not be empty'] = 'لا يمكن ان تبقي اسم الألبوم خالي';
$lang['Lock categories'] = 'قفل الألبوم';
$lang['Private category'] = 'ألبوم خاص';
$lang['Public category'] = 'ألبوم عام';
$lang['Lock albums'] = 'قفل الألبوم';
$lang['Private'] = 'ألبوم خاص';
$lang['Public'] = 'ألبوم عام';
$lang['Find a new representant by random'] = 'اظهر جديد التواصيف او التمثيل بطريقة عشوائية';
$lang['Public / Private'] = 'العام/ الخاص';
$lang['Manage authorizations for selected categories'] = 'ادارة تصريح التعليقات على الألبومات';
$lang['Select uploadable categories'] = 'اختيارالألبوم المحمل';
$lang['Virtual category added'] = 'الألبوم المضاف';
$lang['Virtual category deleted'] = 'الألبوم المحذوف';
$lang['Virtual album added'] = 'الألبوم المضاف';
$lang['Virtual album deleted'] = 'الألبوم المحذوف';
$lang['Category'] = 'الألبوم';
$lang['Access type'] = 'طريقة الدخول';
$lang['Comments'] = 'التعليقات';
Expand Down
28 changes: 14 additions & 14 deletions language/cs_CZ/admin.lang.php
View file
Expand Up @@ -60,14 +60,14 @@
$lang['Add selected elements to caddie'] = 'Přidat vybrané položky do košíku';
$lang['Add'] = 'Přidat';
$lang['Allow user registration'] = 'Povolit registraci uživatelů';
$lang['Apply to subcategories'] = 'Použít na podkategorie';
$lang['Apply to sub-albums'] = 'Použít na podkategorie';
$lang['Associated'] = 'Přiřazeno';
$lang['Association to categories'] = 'Spojit s kategorií';
$lang['Batch management'] = 'Správa dávkových úkonů';
$lang['Caddie management'] = 'Správa košíku';
$lang['Caddie'] = 'Košík';
$lang['Categories authorized thanks to group associations'] = 'Kategorie schváleny díky skupinovým spojením';
$lang['Categories manual order was saved'] = 'Manuální řazení kategorií bylo schváleno';
$lang['Album manual order was saved'] = 'Manuální řazení kategorií bylo schváleno';
$lang['Category elements associated to the following categories: %s'] = 'Položky kategorií navázány do následujících kategorií: %s';
$lang['Check for upgrade failed for unknown reasons.'] = 'Zjištění možnosti aktualizace se nezdařilo';
$lang['Check for upgrade'] = 'Zjistit možnost aktualizace';
Expand Down Expand Up @@ -108,7 +108,7 @@
$lang['Install'] = 'Instalovat';
$lang['Link all category elements to a new category'] = 'Napojit všechny položky na novou kategorii';
$lang['Link all category elements to some existing categories'] = 'Napojit všechny položky na některé existující kategorie';
$lang['Linked categories'] = 'Napojené kategorie';
$lang['Linked albums'] = 'Napojené kategorie';
$lang['Lock gallery'] = 'Zamknout galerii';
$lang['Maintenance'] = 'Údržba';
$lang['Manage permissions for a category'] = 'Nastavit práva pro kategorii';
Expand All @@ -117,11 +117,11 @@
$lang['Manage tags'] = 'Správa klíčových slov';
$lang['Members'] = 'Členové';
$lang['Metadata synchronized from file'] = 'Metadata synchronizována ze souboru';
$lang['Move categories'] = 'Přesunout kategorie';
$lang['Move albums'] = 'Přesunout kategorie';
$lang['Move'] = 'Přesunout';
$lang['Name'] = 'Jméno';
$lang['New name'] = 'Nové jméno';
$lang['New parent category'] = 'Nová rodičovská kategorie';
$lang['New parent album'] = 'Nová rodičovská kategorie';
$lang['New tag'] = 'Nové klíčové slovo';
$lang['Number of comments per page'] = 'Počet komentářů na stránce';
$lang['Number of rates'] = 'Počet hodnocení';
Expand All @@ -131,7 +131,7 @@
$lang['Options'] = 'Nastavení';
$lang['Other private categories'] = 'Další soukromé kategorie';
$lang['Page banner'] = 'Banner stránky';
$lang['Parent category'] = 'Rodičovská kategorie';
$lang['Parent album'] = 'Rodičovská kategorie';
$lang['Path'] = 'Cesta';
$lang['Permalink'] = 'Pernamentní spojení';
$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'Pernamentní spojení %s bylo předtím použito kategorií %s. Nejprve smažte z historie spojení.';
Expand Down Expand Up @@ -166,7 +166,7 @@
$lang['Site manager'] = 'Správce stránky';
$lang['Status'] = 'Stav';
$lang['Statistics'] = 'Statistiky';
$lang['Storage category'] = 'Kategorie umístění';
$lang['Storage album'] = 'Kategorie umístění';
$lang['Sum of rates'] = 'Sumarizace hodnocení';
$lang['Tag "%s" already exists'] = 'Klíčové slovo "%" už existuje';
$lang['Tag "%s" was added'] = '"%" klíčových slov bylo přidáno';
Expand All @@ -184,7 +184,7 @@
$lang['Version'] = 'Verze';
$lang['Virtual categories movement'] = 'Přesun virtuálních kategorií';
$lang['Virtual categories to move'] = 'Virtuální kategorie k přesunu';
$lang['Virtual category name'] = 'Název virtuální kategorie';
$lang['Virtual album name'] = 'Název virtuální kategorie';
$lang['Webmaster cannot be deleted'] = 'Administrátor nemůže být smazán';
$lang['You are running on development sources, no check possible.'] = 'Jsou používány vývojové zdrojové kódy, zjištění není možné.';
$lang['You cannot delete your account'] = 'Nemůžete smazat svůj účet';
Expand All @@ -195,18 +195,18 @@
$lang['associate to category'] = 'Přiřadit ke kategorii';
$lang['associate to group'] = 'Přiřadit ke skupině';
$lang['Authorized'] = 'Autorizováno';
$lang['Add a virtual category'] = 'Přidat virtuální kategorii';
$lang['Add a virtual album'] = 'Přidat virtuální kategorii';
$lang['Authorize users to add comments on selected categories'] = 'Povolit uživatelům komentovat vybrané kategorie';
$lang['The name of a category should not be empty'] = 'Jméno kategorie nesmí být prázdné';
$lang['Lock categories'] = 'Zamknout kategorie';
$lang['Private category'] = 'Soukromá kategorie';
$lang['Public category'] = 'Veřejná kategorie';
$lang['Lock albums'] = 'Zamknout kategorie';
$lang['Private'] = 'Soukromá kategorie';
$lang['Public'] = 'Veřejná kategorie';
$lang['Find a new representant by random'] = 'Najít reprezentativní obrázek pomocí náhodného výběru';
$lang['Public / Private'] = 'Veřejná / Soukromá';
$lang['Manage authorizations for selected categories'] = 'Nastavit oprávnění pro vybrané kategorie';
$lang['Select uploadable categories'] = 'Zvolit kategorie s možností nahrávání obsahu';
$lang['Virtual category added'] = 'Virtuální kategorie přidána';
$lang['Virtual category deleted'] = 'Virtuální kategorie smazána';
$lang['Virtual album added'] = 'Virtuální kategorie přidána';
$lang['Virtual album deleted'] = 'Virtuální kategorie smazána';
$lang['Category'] = 'Kategorie';
$lang['Access type'] = 'Druh přístupu';
$lang['Comments'] = 'Komentáře uživatelů';
Expand Down

0 comments on commit 7907d31

Please sign in to comment.