feature 1616: rename "category" into "album" (3rd commit; still to come)

git-svn-id: http://piwigo.org/svn/trunk@6988 68402e56-0260-453c-a942-63ccdbb3a9ee

27 files changed, 381 insertions, 402 deletions

diff --git a/language/ar_SA/admin.lang.php b/language/ar_SA/admin.lang.php
index ed44a4674..af44443ae 100644
--- a/language/ar_SA/admin.lang.php
+++ b/language/ar_SA/admin.lang.php
@@ -65,7 +65,7 @@ $lang['Caddie management'] = 'ادارة السلة';
 $lang['Caddie'] = 'السلة';
 $lang['Categories authorized thanks to group associations'] = 'تم المصادقة عى الألبومات ، شكرا لله';
 $lang['Album manual order was saved'] = 'طلب الألبومات اليدوية تم حفظه';
-$lang['Category elements associated to the following categories: %s'] = 'تنصيف العناصر المرتبطة الى الفئات التالية: %s';
+$lang['Album elements associated to the following albums: %s'] = 'تنصيف العناصر المرتبطة الى الفئات التالية: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'لم يتم التحدث لاسباب غير معروفه.';
 $lang['Check for upgrade'] = 'التأكد من التحديثات';
 $lang['Comments for all'] = 'يسمح للجميع بالتعليق دون استثناء و دون طائفية :)';
@@ -103,12 +103,12 @@ $lang['Guests'] = 'الضيوف';
 $lang['History'] = 'السجـل';
 $lang['Informations'] = 'المعلومات';
 $lang['Install'] = 'تثبيت';
-$lang['Link all category elements to a new category'] = 'اربط جميع عناصر الألبومات بالألبوم الجديد';
-$lang['Link all category elements to some existing categories'] = 'اربط جميع عناصر الألبوم للقائمة الألبومات المشابهه';
+$lang['Link all album elements to a new album'] = 'اربط جميع عناصر الألبومات بالألبوم الجديد';
+$lang['Link all album elements to some existing albums'] = 'اربط جميع عناصر الألبوم للقائمة الألبومات المشابهه';
 $lang['Linked albums'] = 'ربط الألبومات';
 $lang['Lock gallery'] = 'اغلاق المعرض';
 $lang['Maintenance'] = 'صيانة';
-$lang['Manage permissions for a category'] = 'ادراة تصاريح الألبومات';
+$lang['Edit album permissions'] = 'ادراة تصاريح الألبومات';
 $lang['Manage permissions for group "%s"'] = 'ادارة تصاريح المجموعه "%s"';
 $lang['Manage permissions for user "%s"'] = 'ادارة تصاريح المشتركين "%s"';
 $lang['Manage tags'] = 'ادارة الكلمات الدلائلية';
@@ -156,7 +156,7 @@ $lang['Representative'] = 'التوصيف  أو التمثيل';
 $lang['Represents'] = 'يُـمثل';
 $lang['Save order'] = 'حفظ المطلوب';
 $lang['Save to permalink history'] = 'حفظ في سجل الرابط الدائم';
-$lang['Select at least one category'] = 'اختر على الاقل ألبوم واحد يا أخي';
+$lang['Select at least one album'] = 'اختر على الاقل ألبوم واحد يا أخي';
 $lang['Select at least one picture'] = 'اختر على الاقل صورة واحدة يا حبيبي';
 $lang['Select at least one user'] = 'اختر  عضوا واحد على الاقل';
 $lang['Show info'] = 'اعرض المعلومات';
@@ -179,22 +179,21 @@ $lang['Validate All'] = 'تصريح الكل';
 $lang['Validate'] = 'تصريح';
 $lang['Validation'] = 'التصريح';
 $lang['Version'] = 'الاصدار';
-$lang['Virtual categories movement'] = 'نقل الألبومات';
-$lang['Virtual categories to move'] = 'لنقل الألبومات';
+$lang['Virtual albums to move'] = 'لنقل الألبومات';
 $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'] = "لا تستطيع حذف حسابك";
-$lang['You cannot move a category in its own sub category'] = 'لايمكن حذف ألبوم يحتوي على ألبوم فرعي';
+$lang['You cannot move a album in its own sub album'] = 'لايمكن حذف ألبوم يحتوي على ألبوم فرعي';
 $lang['You need to confirm deletion'] = 'تحتاج  تأكيد الحذف';
 $lang['add tags'] = 'اضافةكلمة دلائلية';
 $lang['Adviser'] = 'مرشد';
-$lang['associate to category'] = 'المرتبط بهذا الألبوم';
+$lang['Associate to album'] = 'المرتبط بهذا الألبوم';
 $lang['associate to group'] = 'مرتبط بهذه المجموعه';
 $lang['Authorized'] = 'المرخص';
 $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['The name of an album must not be empty'] = 'لا يمكن ان  تبقي اسم الألبوم خالي';
 $lang['Lock albums'] = 'قفل الألبوم';
 $lang['Private'] = 'ألبوم خاص';
 $lang['Public'] = 'ألبوم عام';
@@ -216,11 +215,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = 'ع�
 $lang['Configuration'] = 'التهيئة';
 $lang['confirm'] = 'تـأكيد';
 $lang['Date'] = 'التاريخ';
-$lang['delete category'] = 'حذف الألبوم';
-$lang['dissociate from category'] = 'فصل من الألبوم';
+$lang['delete album'] = 'حذف الألبوم';
+$lang['Dissociate from album'] = 'فصل من الألبوم';
 $lang['dissociate from group'] = 'فصل من المجموعه';
-$lang['edit category permissions'] = 'تحرير تصاريح الألبوم';
-$lang['Category informations updated successfully.'] = 'تم تحديث معلومات الألبومات بنجاح منقط النظير.';
+$lang['edit album permissions'] = 'تحرير تصاريح الألبوم';
+$lang['Album updated successfully'] = 'تم تحديث معلومات الألبومات بنجاح منقط النظير.';
 $lang['Authorize upload'] = 'السماح بالتحميل';
 $lang['elements per page'] = 'عدد في كل صفحة';
 $lang['elements'] = 'عناصر';
@@ -238,13 +237,13 @@ $lang['The name of a group must not contain " or \' or be empty.'] = 'لا تس�
 $lang['This name is already used by another group.'] = 'هذا الاسم مستخدم من قبل مجموعه أ×خرى.';
 $lang[''] = '';
 $lang['High definition'] = 'ابعاد الارتفاع';
-$lang['jump to category'] = 'اغفز للمجموعة';
+$lang['jump to album'] = 'اغفز للمجموعة';
 $lang['jump to image'] = 'اغفز للصورة';
 $lang['leave'] = 'تـَرك';
 $lang['Lock'] = 'قفل';
 $lang['Locked'] = 'مقفول';
-$lang['manage category elements'] = 'ادارةعناصر الألبوم';
-$lang['manage sub-categories'] = 'صور الألبوم الفرعي';
+$lang['manage album elements'] = 'ادارةعناصر الألبوم';
+$lang['manage sub-albums'] = 'صور الألبوم الفرعي';
 $lang['Manage'] = 'إدارة';
 $lang['maximum height'] = 'الارتفاع الاقصى';
 $lang['maximum width'] = 'العرض الاقصى';
@@ -390,7 +389,7 @@ $lang['for this file format'] = 'لتنسيق هذا الملف';
 $lang['unit mode'] = 'نمط موحد';
 $lang['Unlocked'] = 'غيرمقفل';
 $lang['unset'] = 'غير مهيأ';
-$lang['Update categories informations'] = 'تحديث ملعومات الألبومات';
+$lang['Update albums informations'] = 'تحديث ملعومات الألبومات';
 $lang['Update images informations'] = 'تحديث معلومات الصور';
 $lang['Synchronize'] = 'التزامن';
 $lang['reduce to single existing categories'] = 'تقليص الألبومات الحاليه';
diff --git a/language/cs_CZ/admin.lang.php b/language/cs_CZ/admin.lang.php
index 79cfe0bd8..a843f26ab 100644
--- a/language/cs_CZ/admin.lang.php
+++ b/language/cs_CZ/admin.lang.php
@@ -68,7 +68,7 @@ $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['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['Album elements associated to the following albums: %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';
 $lang['Comments for all'] = 'Komentáře pro všechny';
@@ -106,12 +106,12 @@ $lang['Guests'] = 'Hosté';
 $lang['History'] = 'Historie';
 $lang['Informations'] = 'Informace';
 $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['Link all album elements to a new album'] = 'Napojit všechny položky na novou kategorii';
+$lang['Link all album elements to some existing albums'] = 'Napojit všechny položky na některé existující 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';
+$lang['Edit album permissions'] = 'Nastavit práva pro kategorii';
 $lang['Manage permissions for group "%s"'] = 'Nastavit práva pro skupinu "%s"';
 $lang['Manage permissions for user "%s"'] = 'Nastavit práva pro uživatele "%s"';
 $lang['Manage tags'] = 'Správa klíčových slov';
@@ -159,7 +159,7 @@ $lang['Representative'] = 'Reprezentativní fotografie';
 $lang['Represents'] = 'Reprezentativní fotografie';
 $lang['Save order'] = 'Uložit pořadí';
 $lang['Save to permalink history'] = 'Uložit do historie pernamentního spojení';
-$lang['Select at least one category'] = 'Je nutné zvolit alespoň jednu kategorii';
+$lang['Select at least one album'] = 'Je nutné zvolit alespoň jednu kategorii';
 $lang['Select at least one picture'] = 'Je nutné zvolit alespoň jednu fotografii';
 $lang['Select at least one user'] = 'Je nutné zvolit alespoň jednoho uživatele';
 $lang['Show info'] = 'Zobrazit informace';
@@ -182,22 +182,21 @@ $lang['Validate All'] = 'Schválit všechny';
 $lang['Validate'] = 'Schválit';
 $lang['Validation'] = 'Schválení';
 $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 albums to move'] = 'Virtuální kategorie k přesunu';
 $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';
-$lang['You cannot move a category in its own sub category'] = 'Nelze přesunout kategorii do její vlastní podkategorie';
+$lang['You cannot move a album in its own sub album'] = 'Nelze přesunout kategorii do její vlastní podkategorie';
 $lang['You need to confirm deletion'] = 'Je nutné potvrdit vymazání';
 $lang['add tags'] = 'Přidat klíčová slova';
 $lang['Adviser'] = 'Průvodce';
-$lang['associate to category'] = 'Přiřadit ke kategorii';
+$lang['Associate to album'] = 'Přiřadit ke kategorii';
 $lang['associate to group'] = 'Přiřadit ke skupině';
 $lang['Authorized'] = 'Autorizováno';
 $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['The name of an album must not be empty'] = 'Jméno kategorie nesmí být prázdné';
 $lang['Lock albums'] = 'Zamknout kategorie';
 $lang['Private'] = 'Soukromá kategorie';
 $lang['Public'] = 'Veřejná kategorie';
@@ -219,11 +218,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = 'Po�
 $lang['Configuration'] = 'Konfigurace';
 $lang['confirm'] = 'Potvrdit';
 $lang['Date'] = 'Datum';
-$lang['delete category'] = 'Vymazat kategorii';
-$lang['dissociate from category'] = 'Oddělit od kategorie';
+$lang['delete album'] = 'Vymazat kategorii';
+$lang['Dissociate from album'] = 'Oddělit od kategorie';
 $lang['dissociate from group'] = 'Oddělit od skupiny';
-$lang['edit category permissions'] = 'Upravit oprávnění ke kategorii';
-$lang['Category informations updated successfully.'] = 'Informace o kategorii byly úspěšně aktualizovány';
+$lang['edit album permissions'] = 'Upravit oprávnění ke kategorii';
+$lang['Album updated successfully'] = 'Informace o kategorii byly úspěšně aktualizovány';
 $lang['Authorize upload'] = 'Povolit nahrávání fotografií';
 $lang['elements per page'] = 'Položek na stránce';
 $lang['elements'] = 'Položky';
@@ -241,13 +240,13 @@ $lang['The name of a group must not contain " or \' or be empty.'] = 'Název sku
 $lang['This name is already used by another group.'] = 'Toto jméno je již používáno pro jinou skupinu.';
 $lang[''] = '';
 $lang['High definition'] = 'Vysoké rozlišení';
-$lang['jump to category'] = 'Přejít do kategorie';
+$lang['jump to album'] = 'Přejít do kategorie';
 $lang['jump to image'] = 'Přejít na obrázek';
 $lang['leave'] = 'Ponechat';
 $lang['Lock'] = 'Zamknout';
 $lang['Locked'] = 'Uzamknuto';
-$lang['manage category elements'] = 'Spravovat položky kategorie';
-$lang['manage sub-categories'] = 'Spravovat podkategorie';
+$lang['manage album elements'] = 'Spravovat položky kategorie';
+$lang['manage sub-albums'] = 'Spravovat podkategorie';
 $lang['Manage'] = 'Správa';
 $lang['maximum height'] = 'maximální výška';
 $lang['maximum width'] = 'maximální šířka';
@@ -393,7 +392,7 @@ $lang['for this file format'] = 'pro tento formát souboru';
 $lang['unit mode'] = 'jednotlivě';
 $lang['Unlocked'] = 'Odemknuto';
 $lang['unset'] = 'Nenastavovat';
-$lang['Update categories informations'] = 'Aktualizovat informace o kategoriích';
+$lang['Update albums informations'] = 'Aktualizovat informace o kategoriích';
 $lang['Update images informations'] = 'Aktualizovat informace o fotografiích';
 $lang['Synchronize'] = 'Synchronizace';
 $lang['reduce to single existing categories'] = 'Převést do jediné existující kategorie';
@@ -620,7 +619,7 @@ $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Vy
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Povolte zápis (chmod 777,644,atd.) do "%s" adresáře v kořenovém adresáři instalace Piwigo';
 $lang['existing category'] = 'stávající kategorie';
 $lang['create a new category'] = 'Založit novou Kategorii';
-$lang['Category name'] = 'Název kategorie';
+$lang['Album name'] = 'Název kategorie';
 $lang['Category "%s" has been added'] = 'Kategorie "%s" přidána';
 $lang['Uploaded Photos'] = 'Nahrát fotografie';
 $lang['%d photos uploaded'] = '%d fotografií nahráno';
diff --git a/language/da_DK/admin.lang.php b/language/da_DK/admin.lang.php
index 5b82cd80d..837de931f 100644
--- a/language/da_DK/admin.lang.php
+++ b/language/da_DK/admin.lang.php
@@ -67,7 +67,7 @@ $lang['Caddie management']     =     'Caddie forvaltning';
 $lang['Caddie']     =     'Caddie';
 $lang['Categories authorized thanks to group associations']     =     'Kategorier tilladelse takket være gruppe tilknytninger';
 $lang['Album manual order was saved']     =     'Kategorier manual ordre er blevet gemt';
-$lang['Category elements associated to the following categories: %s']     =     'Kategori elementer i tilknytning til følgende kategorier:% s';
+$lang['Album elements associated to the following albums: %s']     =     'Kategori elementer i tilknytning til følgende kategorier:% s';
 $lang['Check for upgrade failed for unknown reasons.']     =     'Check for opgradering mislykkedes af ukendte årsager.';
 $lang['Check for upgrade'] = 'Tjek efter opgradering';
 $lang['Comments for all']     =     'Kommentarer til alle';
@@ -105,12 +105,12 @@ $lang['Guests']     =     'Gæster';
 $lang['History']     =     'Historie';
 $lang['Informations'] = 'Informationer';
 $lang['Install']     =     'Installer';
-$lang['Link all category elements to a new category']     =     'Link alle Kategori elementer til en ny Kategori';
-$lang['Link all category elements to some existing categories']     =     'Link alle Kategori elementer til nogle eksisterende kategorier';
+$lang['Link all album elements to a new album']     =     'Link alle Kategori elementer til en ny Kategori';
+$lang['Link all album elements to some existing albums']     =     'Link alle Kategori elementer til nogle eksisterende kategorier';
 $lang['Linked albums']     =     'Linkede kategorier';
 $lang['Lock gallery']     =     'Lås galleri';
 $lang['Maintenance']     =     'Vedligeholdelse';
-$lang['Manage permissions for a category']     =     'Administrer tilladelser for en Kategori';
+$lang['Edit album permissions']     =     'Administrer tilladelser for en Kategori';
 $lang['Manage permissions for group "%s"']     =     'Administrer tilladelser til gruppen \'% s \'';
 $lang['Manage permissions for user "%s"']     =     'Administrer tilladelser for brugeren \'% s \'';
 $lang['Manage tags']     =     'Administrer tags';
@@ -158,7 +158,7 @@ $lang['Representative']     =     'Repræsentant';
 $lang['Represents']     =     'Repræsenterer';
 $lang['Save order']     =     'Gem orden';
 $lang['Save to permalink history']     =     'Gem til permalinks historie';
-$lang['Select at least one category']     =     'Vælg mindst én Kategori';
+$lang['Select at least one album']     =     'Vælg mindst én Kategori';
 $lang['Select at least one picture']     =     'Vælg mindst et billede';
 $lang['Select at least one user']     =     'Vælg mindst én bruger';
 $lang['Show info']     =     'Vis info';
@@ -181,22 +181,21 @@ $lang['Validate All']     =     'Godkend alle';
 $lang['Validate']     =     'Godkend';
 $lang['Validation']     =     'Bekræftelse';
 $lang['Version']     =     'Version';
-$lang['Virtual categories movement']     =     'Virtuel kategorier bevægelse';
-$lang['Virtual categories to move']     =     'Virtuel kategorier til at flytte';
+$lang['Virtual albums to move']     =     'Virtuel kategorier til at flytte';
 $lang['Virtual album name']     =     'Virtuel Kategori navn';
 $lang['Webmaster cannot be deleted']     =     'Webmaster kan ikke slettes';
 $lang['You are running on development sources, no check possible.']     =     'Du kører på udviklings kilder, ingen tjek muligt.';
 $lang['You cannot delete your account']     =     'Du kan ikke slette din konto';
-$lang['You cannot move a category in its own sub category']     =     'Du kan ikke flytte en Kategori i dets eget under-kategori';
+$lang['You cannot move a album in its own sub album']     =     'Du kan ikke flytte en Kategori i dets eget under-kategori';
 $lang['You need to confirm deletion']     =     'Du skal bekræfte sletning';
 $lang['add tags']     =     'Tilføj tags';
 $lang['Adviser']     =     'Rådgiver';
-$lang['associate to category']     =     'Associeret til Kategori';
+$lang['Associate to album']     =     'Associeret til Kategori';
 $lang['associate to group']     =     'Associeret til Gruppe';
 $lang['Authorized']     =     'Autoriseret';
 $lang['Add a virtual album']     =     'Tilføj en virtuel Kategori';
 $lang['Authorize users to add comments on selected categories']     =     'Godkendelse af brugere at tilføje kommentarer på udvalgte kategorier';
-$lang['The name of a category should not be empty']     =     'Navnet på en Kategori, kan ikke ikke være tomt';
+$lang['The name of an album must not be empty']     =     'Navnet på en Kategori, kan ikke ikke være tomt';
 $lang['Lock albums']     =     'Lås kategorier';
 $lang['Private']     =     'Private Kategori';
 $lang['Public']     =     'Offentlige Kategori';
@@ -218,11 +217,11 @@ $lang['The number of comments a page must be between 5 and 50 included.']     =
 $lang['Configuration']     =     'Konfiguration';
 $lang['confirm']     =     'Bekræfte';
 $lang['Date']     =     'Dato';
-$lang['delete category']     =     'Slet Kategori';
-$lang['dissociate from category']     =     'Adskille fra Kategori';
+$lang['delete album']     =     'Slet Kategori';
+$lang['Dissociate from album']     =     'Adskille fra Kategori';
 $lang['dissociate from group']     =     'Adskille fra Gruppe';
-$lang['edit category permissions']     =     'Edit Kategori tilladelser';
-$lang['Category informations updated successfully.']     =     'Kategori informationer opdateret.';
+$lang['edit album permissions']     =     'Edit Kategori tilladelser';
+$lang['Album updated successfully']     =     'Kategori informationer opdateret.';
 $lang['Authorize upload']     =     'Godkendelse af upload';
 $lang['elements per page']     =     'Elementer pr side';
 $lang['elements']     =     'Elementer';
@@ -239,13 +238,13 @@ $lang['group']     =     'Gruppe';
 $lang['The name of a group must not contain " or \' or be empty.'] = 'Navnet på en Gruppe må ikke indeholde \' eller \'eller være tomme. ';
 $lang['This name is already used by another group.']     =     'Dette navn bruges allerede af en anden Gruppe.';
 $lang['High definition']     =     'High definition';
-$lang['jump to category']     =     'Hop til Kategori';
+$lang['jump to album']     =     'Hop til Kategori';
 $lang['jump to image']     =     'Hop til billedet';
 $lang['leave']     =     'Ferie';
 $lang['Lock'] = 'Lås';
 $lang['Locked'] = 'Låst';
-$lang['manage category elements']     =     'Administrer Kategori elementer';
-$lang['manage sub-categories']     =     'Administrer sub-kategorier';
+$lang['manage album elements']     =     'Administrer Kategori elementer';
+$lang['manage sub-albums']     =     'Administrer sub-kategorier';
 $lang['Manage']     =     'Administrer';
 $lang['maximum height']     =     'Maksimal højde';
 $lang['maximum width']     =     'Maksimal bredde';
@@ -394,7 +393,7 @@ $lang['for this file format']     =     'For denne fil format';
 $lang['unit mode']     =     'Single-mode';
 $lang['Unlocked'] = 'Låst op';
 $lang['unset']     =     'Unset';
-$lang['Update categories informations']     =     'Update kategorier information';
+$lang['Update albums informations']     =     'Update kategorier information';
 $lang['Update images informations']     =     'Update billeder information';
 $lang['Synchronize']     =     'Synkroniser';
 $lang['reduce to single existing categories']     =     'Reduceres til én eksisterende kategorier';
@@ -645,7 +644,7 @@ $lang['Create the "%s" directory at the root of your Piwigo installation']     =
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation']     =     'Giv skrive adgang (chmod 777) til \'%s\' bibliotek i roden af din Piwigo anlæg';
 $lang['existing category']     =     'Eksisterende Kategori ';
 $lang['create a new category']     =     'Oprette et nyt Kategori ';
-$lang['Category name']     =     'Kategori navn ';
+$lang['Album name']     =     'Kategori navn ';
 $lang['Category "%s" has been added']     =     'Kategori \'%s\' er blevet tilføjet ';
 $lang['Uploaded Photos']     =     'Uploadede fotos ';
 $lang['%d photos uploaded']     =     ' %d uploaded billeder';
diff --git a/language/de_DE/admin.lang.php b/language/de_DE/admin.lang.php
index 95f79f6b0..bc5ce992c 100644
--- a/language/de_DE/admin.lang.php
+++ b/language/de_DE/admin.lang.php
@@ -65,7 +65,7 @@ $lang['Caddie management'] = 'Sammelkorb verwalten';
 $lang['Caddie'] = 'Sammelkorb';
 $lang['Categories authorized thanks to group associations'] = 'Für Kategorien freigeschaltet durch Gruppenzugehörigkeit';
 $lang['Album manual order was saved'] = 'Albenreihenfolge gespeichert';
-$lang['Category elements associated to the following categories: %s'] = 'Kategorieelemente zu folgenden Kategorien zugeordnet: %s';
+$lang['Album elements associated to the following albums: %s'] = 'Kategorieelemente zu folgenden Kategorien zugeordnet: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'Suche nach einem Upgrade nicht möglich.';
 $lang['Check for upgrade'] = 'Prüfe ob eine neue Version der Bildergalerie verfügbar ist.';
 $lang['Comments for all'] = 'Kommentare für alle erlaubt';
@@ -103,12 +103,12 @@ $lang['Guests'] = 'Gäste';
 $lang['History'] = 'Statistik';
 $lang['Informations'] = 'Kategorieinformation';
 $lang['Install'] = 'Installiere';
-$lang['Link all category elements to a new category'] = 'Verlinkte alle Kategorieelemente zu einer neuen Kategorie';
-$lang['Link all category elements to some existing categories'] = 'Verlinkte alle Kategorieelemente zu einer bestehenden Kategorie';
+$lang['Link all album elements to a new album'] = 'Verlinkte alle Kategorieelemente zu einer neuen Kategorie';
+$lang['Link all album elements to some existing albums'] = 'Verlinkte alle Kategorieelemente zu einer bestehenden Kategorie';
 $lang['Linked albums'] = 'Verlinkte Alben';
 $lang['Lock gallery'] = 'Blockiere Schreibzugriffe auf die Datenbank für Wartungsarbeiten';
 $lang['Maintenance'] = 'Wartung';
-$lang['Manage permissions for a category'] = 'Befugnisse für Kategorien verwalten';
+$lang['Edit album permissions'] = 'Befugnisse für Kategorien verwalten';
 $lang['Manage permissions for group "%s"'] = 'verwalte Zugriffsrechte für die Gruppe "%s"';
 $lang['Manage permissions for user "%s"'] = 'verwalte Zugriffsrechte für den Benutzer "%s"';
 $lang['Manage tags'] = 'Verwalte Tags';
@@ -156,7 +156,7 @@ $lang['Representative'] = 'Vorschaubild';
 $lang['Represents'] = 'Ist Vorschaubild für diese Kategorien';
 $lang['Save order'] = 'Reihenfolge speichern';
 $lang['Save to permalink history'] = 'Speichere in der Permalink-Historie';
-$lang['Select at least one category'] = 'Mindestens eine Kategorie auswählen';
+$lang['Select at least one album'] = 'Mindestens eine Kategorie auswählen';
 $lang['Select at least one picture'] = 'Mindestens ein Element auswählen';
 $lang['Select at least one user'] = 'Mindestens einen Benutzer auswählen';
 $lang['Show info'] = 'Info anzeigen';
@@ -179,22 +179,21 @@ $lang['Validate All'] = 'Gebe alle frei';
 $lang['Validate'] = 'Freigeben';
 $lang['Validation'] = 'Freigabe der Kommentare durch den Admin';
 $lang['Version'] = 'Version';
-$lang['Virtual categories movement'] = 'Verschieben virtueller Kategorien';
-$lang['Virtual categories to move'] = 'Wähle eine oder mehrere Virtuelle Kategorien aus um sie zu verschieben';
+$lang['Virtual albums to move'] = 'Wähle eine oder mehrere Virtuelle Kategorien aus um sie zu verschieben';
 $lang['Virtual album name'] = 'Virtueller Albenname';
 $lang['Webmaster cannot be deleted'] = 'Webmaster kann nicht gelöscht werden';
 $lang['You are running on development sources, no check possible.'] = 'Sie benutzen eine Entwicklerversion von Piwigo, es kann keine Suche nach Aktualisierungen vorgenommen werden.';
 $lang['You cannot delete your account'] = "Du kannst deinen eigenen Acount nicht löschen";
-$lang['You cannot move a category in its own sub category'] = 'Sie können eine Kategorie nicht in ihre eigene Unterkategorie verschieben.';
+$lang['You cannot move a album in its own sub album'] = 'Sie können eine Kategorie nicht in ihre eigene Unterkategorie verschieben.';
 $lang['You need to confirm deletion'] = 'Löschen bitte bestätigen';
 $lang['add tags'] = 'Tags hinzufügen';
 $lang['Adviser'] = 'Berater';
-$lang['associate to category'] = 'Mit Kategorie verbinden';
+$lang['Associate to album'] = 'Mit Kategorie verbinden';
 $lang['associate to group'] = 'Mit Gruppe verbinden';
 $lang['Authorized'] = 'Freigegebene Kategorien';
 $lang['Add a virtual album'] = 'Virtuelles Album hinzufügen';
 $lang['Authorize users to add comments on selected categories'] = 'Benutzern erlauben, in ausgewählten Kategorien Kommentare zu schreiben';
-$lang['The name of a category should not be empty'] = 'Name der Kategorie darf nicht leer sein.';
+$lang['The name of an album must not be empty'] = 'Name der Kategorie darf nicht leer sein.';
 $lang['Lock albums'] = 'Alben sperren';
 $lang['Private'] = 'Private Kategorie';
 $lang['Public'] = 'öffentliche Kategorie';
@@ -216,11 +215,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = 'Anz
 $lang['Configuration'] = 'Konfiguration';
 $lang['confirm'] = 'bestätigen';
 $lang['Date'] = 'Datum';
-$lang['delete category'] = 'Lösche Kategorie';
-$lang['dissociate from category'] = 'Von Kategorie abtrennen';
+$lang['delete album'] = 'Lösche Kategorie';
+$lang['Dissociate from album'] = 'Von Kategorie abtrennen';
 $lang['dissociate from group'] = 'Von Gruppe abtrennen';
-$lang['edit category permissions'] = 'Berechtigungen für Kategorie ändern';
-$lang['Category informations updated successfully.'] = 'Kategorieinformationen erfolgreich aktualisiert.';
+$lang['edit album permissions'] = 'Berechtigungen für Kategorie ändern';
+$lang['Album updated successfully'] = 'Kategorieinformationen erfolgreich aktualisiert.';
 $lang['Authorize upload'] = 'Erlaube upload';
 $lang['elements per page'] = 'Elemente pro Seite';
 $lang['elements'] = 'Elemente';
@@ -237,13 +236,13 @@ $lang['group'] = 'Gruppe';
 $lang['The name of a group must not contain " or \' or be empty.'] = 'Der Gruppenname darf kein " oder \' enthalten oder leer bleiben.';
 $lang['This name is already used by another group.'] = 'Diesen Gruppenname gibt es schon.';
 $lang['High definition'] = 'High definition';
-$lang['jump to category'] = 'Gehe zu Kategorie';
+$lang['jump to album'] = 'Gehe zu Kategorie';
 $lang['jump to image'] = 'Gehe zu Element';
 $lang['leave'] = 'Beibehalten';
 $lang['Lock'] = 'Schließen';
 $lang['Locked'] = 'Geschlossen';
-$lang['manage category elements'] = 'Kategorieelemente verwalten';
-$lang['manage sub-categories'] = 'Unterkategorien verwalten';
+$lang['manage album elements'] = 'Kategorieelemente verwalten';
+$lang['manage sub-albums'] = 'Unterkategorien verwalten';
 $lang['Manage'] = 'Verwalten';
 $lang['maximum height'] = 'maximale Höhe';
 $lang['maximum width'] = 'maximale Breite';
@@ -387,7 +386,7 @@ $lang['for this file format'] = 'für dieses Dateiformat';
 $lang['unit mode'] = 'Einzelmodus';
 $lang['Unlocked'] = 'Entsperrt';
 $lang['unset'] = 'Lösche Einstellung';
-$lang['Update categories informations'] = 'Kategorieinformationen aktualisieren';
+$lang['Update albums informations'] = 'Kategorieinformationen aktualisieren';
 $lang['Update images informations'] = 'Bildinformationen aktualisieren';
 $lang['Synchronize'] = 'Synchronisieren';
 $lang['reduce to single existing categories'] = 'Auf einzelne bestehende Kategorien reduzieren';
@@ -646,7 +645,7 @@ $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Er
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Gebe Schreibrechte (chmod 777) dem Ordner "%s" im Hauptordner (root) deiner Piwigoinstallation';
 $lang['existing category'] = 'existierende Kategorie';
 $lang['create a new category'] = 'erstelle eine neue Kategorie';
-$lang['Category name'] = 'Kategoriename';
+$lang['Album name'] = 'Kategoriename';
 $lang['Category "%s" has been added'] = 'Kategorie "%s" wurde hinzugefügt';
 $lang['Uploaded Photos'] = 'Lade Fotos hoch';
 $lang['%d photos uploaded'] = '%d Fotos hochgeladen';
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index fbb712e0c..d0e0de64f 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -66,8 +66,8 @@ $lang['Batch management'] = "Batch management";
 $lang['Caddie management'] = "Caddie management";
 $lang['Caddie'] = "Caddie";
 $lang['Categories authorized thanks to group associations'] = "Categories authorized thanks to group associations";
-$lang['Album manual order was saved'] = "Categories manual order has been saved";
-$lang['Category elements associated to the following categories: %s'] = "Category elements associated to the following categories: %s";
+$lang['Album manual order was saved'] = "Album manual order was saved";
+$lang['Album elements associated to the following albums: %s'] = "Album elements associated to the following albums: %s";
 $lang['Check for upgrade failed for unknown reasons.'] = "Check for upgrade failed for unknown reasons.";
 $lang['Check for upgrade'] = "Check for upgrade";
 $lang['Comments for all'] = "Comments for all";
@@ -105,12 +105,12 @@ $lang['Guests'] = "Guests";
 $lang['History'] = "History";
 $lang['Informations'] = "Informations";
 $lang['Install'] = "Install";
-$lang['Link all category elements to a new category'] = "Link all category elements to a new category";
-$lang['Link all category elements to some existing categories'] = "Link all category elements to existing categories";
+$lang['Link all album elements to a new album'] = "Link all album elements to a new album";
+$lang['Link all album elements to some existing albums'] = "Link all album elements to some existing albums";
 $lang['Linked albums'] = "Linked albums";
 $lang['Lock gallery'] = "Lock gallery";
 $lang['Maintenance'] = "Maintenance";
-$lang['Manage permissions for a category'] = "Manage permissions for a category";
+$lang['Edit album permissions'] = "Edit album permissions";
 $lang['Manage permissions for group "%s"'] = "Manage permissions for the group \"%s\"";
 $lang['Manage permissions for user "%s"'] = "Manage permissions for the user \"%s\"";
 $lang['Manage tags'] = "Manage tags";
@@ -158,7 +158,7 @@ $lang['Representative'] = "Representative";
 $lang['Represents'] = "Represents";
 $lang['Save order'] = "Save order";
 $lang['Save to permalink history'] = "Save to permalinks history";
-$lang['Select at least one category'] = "Select at least one category";
+$lang['Select at least one album'] = "Select at least one album";
 $lang['Select at least one picture'] = "Select at least one picture";
 $lang['Select at least one user'] = "Select at least one user";
 $lang['Show info'] = "Show info";
@@ -181,22 +181,21 @@ $lang['Validate All'] = "Validate All";
 $lang['Validate'] = "Validate";
 $lang['Validation'] = "Validation";
 $lang['Version'] = "Version";
-$lang['Virtual categories movement'] = "Virtual categories movement";
-$lang['Virtual categories to move'] = "Virtual categories to move";
+$lang['Virtual albums to move'] = "Virtual albums to move";
 $lang['Virtual album name'] = "Virtual album name";
 $lang['Webmaster cannot be deleted'] = "Webmaster cannot be deleted";
 $lang['You are running on development sources, no check possible.'] = "You are running on development sources, no check possible.";
 $lang['You cannot delete your account'] = "You cannot delete your account";
-$lang['You cannot move a category in its own sub category'] = "You cannot move a category into its own sub category";
+$lang['You cannot move a album in its own sub album'] = "You cannot move a category into its own sub category";
 $lang['You need to confirm deletion'] = "You must confirm deletion";
 $lang['add tags'] = "add tags";
 $lang['Adviser'] = "Adviser";
-$lang['associate to category'] = "associate to category";
+$lang['Associate to album'] = "Associate to album";
 $lang['associate to group'] = "associate to group";
 $lang['Authorized'] = "Authorized";
 $lang['Add a virtual album'] = "Add a virtual album";
 $lang['Authorize users to add comments on selected categories'] = "Authorize users to add comments on selected categories";
-$lang['The name of a category should not be empty'] = "The name of a category cannot not be empty";
+$lang['The name of an album must not be empty'] = "The name of an album must not be empty";
 $lang['Lock albums'] = "Lock albums";
 $lang['Private'] = "Private";
 $lang['Public'] = "Public";
@@ -218,11 +217,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = "The
 $lang['Configuration'] = "Configuration";
 $lang['confirm'] = "confirm";
 $lang['Date'] = "Date";
-$lang['delete category'] = "delete category";
-$lang['dissociate from category'] = "dissociate from category";
+$lang['delete album'] = "delete album";
+$lang['Dissociate from album'] = "Dissociate from album";
 $lang['dissociate from group'] = "dissociate from group";
-$lang['edit category permissions'] = "edit category permissions";
-$lang['Category informations updated successfully.'] = "Category informations updated successfully.";
+$lang['edit album permissions'] = "edit album permissions";
+$lang['Album updated successfully'] = "Album updated successfully";
 $lang['Authorize upload'] = "Authorize upload";
 $lang['elements per page'] = "elements per page";
 $lang['elements'] = "elements";
@@ -239,13 +238,13 @@ $lang['group'] = "group";
 $lang['The name of a group must not contain " or \' or be empty.'] = "The name of a group must not contain \" or ' or be empty.";
 $lang['This name is already used by another group.'] = "This name is already used by another group.";
 $lang['High definition'] = "High definition";
-$lang['jump to category'] = "jump to category";
+$lang['jump to album'] = "jump to album";
 $lang['jump to image'] = "jump to image";
 $lang['leave'] = "leave";
 $lang['Lock'] = "Lock";
 $lang['Locked'] = "Locked";
-$lang['manage category elements'] = "Manage category elements";
-$lang['manage sub-categories'] = "Manage sub-categories";
+$lang['manage album elements'] = "manage album elements";
+$lang['manage sub-albums'] = "manage sub-albums";
 $lang['Manage'] = "Manage";
 $lang['maximum height'] = "Maximum height";
 $lang['maximum width'] = "Maximum width";
@@ -393,7 +392,7 @@ $lang['for this file format'] = "for this file format";
 $lang['unit mode'] = "single mode";
 $lang['Unlocked'] = "Unlocked";
 $lang['unset'] = "unset";
-$lang['Update categories informations'] = "Update categories information";
+$lang['Update albums informations'] = "Update categories information";
 $lang['Update images informations'] = "Update images information";
 $lang['Synchronize'] = "Synchronize";
 $lang['reduce to single existing categories'] = "reduce to single existing categories";
@@ -645,7 +644,7 @@ $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Cr
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation';
 $lang['existing category'] = 'existing category';
 $lang['create a new category'] = 'create a new category';
-$lang['Category name'] = 'Category name';
+$lang['Album name'] = 'Album name';
 $lang['Category "%s" has been added'] = 'Category "%s" has been added';
 $lang['Uploaded Photos'] = 'Uploaded Photos';
 $lang['%d photos uploaded'] = '%d photos uploaded';
diff --git a/language/en_UK/help/cat_modify.html b/language/en_UK/help/cat_modify.html
index 813fc5c24..392ad30a1 100644
--- a/language/en_UK/help/cat_modify.html
+++ b/language/en_UK/help/cat_modify.html
@@ -107,7 +107,7 @@ representant. Just use <strong>Delete representant</strong> button.</p>
 informations about a picture</span> screen. The only option on the current screen
 is the <strong>Delete representant</strong> button.</p>
 
-<h3>Link all category elements to a new category</h3>
+<h3>Link all album elements to a new album</h3>
 
 <ul>
 
diff --git a/language/en_UK/help/cat_move.html b/language/en_UK/help/cat_move.html
index d781a151e..81e337c53 100644
--- a/language/en_UK/help/cat_move.html
+++ b/language/en_UK/help/cat_move.html
@@ -2,7 +2,7 @@
 
 <p>Only virtual categories can have a new parent category.</p>
 
-<h3>Virtual categories to move</h3>
+<h3>Virtual albums to move</h3>
 
 <p>Select one or several virtual categories you want to move. 
 If the list is empty, that mean you have not created one yet.</p>
diff --git a/language/en_UK/help/cat_perm.html b/language/en_UK/help/cat_perm.html
index c320ecfab..2a613e4c9 100644
--- a/language/en_UK/help/cat_perm.html
+++ b/language/en_UK/help/cat_perm.html
@@ -1,4 +1,4 @@
-<h2>Manage permissions for a category</h2>
+<h2>Edit album permissions</h2>
 
 <p>This screen is only available for private categories. Here you can select
 users and groups authorized for a category.</p>
diff --git a/language/en_UK/help/configuration.html b/language/en_UK/help/configuration.html
index d0bdd99ce..0241c88e2 100644
--- a/language/en_UK/help/configuration.html
+++ b/language/en_UK/help/configuration.html
@@ -96,7 +96,7 @@ users.</p>
 <ul>
 
   <li><strong>Language</strong>: apply to Piwigo
-  labels only. Category names, picture names and all descriptions fields are not
+  labels only. Album names, picture names and all descriptions fields are not
   localized.</li>
 
   <li><strong>Number of images per row</strong></li>
diff --git a/language/en_UK/help/maintenance.html b/language/en_UK/help/maintenance.html
index 040bad8aa..a39513348 100644
--- a/language/en_UK/help/maintenance.html
+++ b/language/en_UK/help/maintenance.html
@@ -24,7 +24,7 @@ information from database make you save disk space.</p>
 
 <ul>
 
-  <li><strong>Update categories informations:</strong> For each category,
+  <li><strong>Update albums informations:</strong> For each category,
   the following information is checked, and updated if necessary : list of parent
   categories, number of pictures, last picture date, position among
   brother categories, position among all categories. This action also checks
diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php
index b3f93749c..c1975926b 100644
--- a/language/es_ES/admin.lang.php
+++ b/language/es_ES/admin.lang.php
@@ -65,7 +65,7 @@ $lang['Caddie management'] = 'Gestión de la cesta';
 $lang['Caddie'] = 'Cesta';
 $lang['Categories authorized thanks to group associations'] = 'Categorías accesibles gracias a la pertenencia a los grupos';
 $lang['Album manual order was saved'] = 'La orden manual de las categorías ha sido salvaguardada';
-$lang['Category elements associated to the following categories: %s'] = 'Los elementos de la categoría han sido asociados con las categorías siguientes : %s';
+$lang['Album elements associated to the following albums: %s'] = 'Los elementos de la categoría han sido asociados con las categorías siguientes : %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'La comprobación de la última versión sobre el servidor fue suspendida por una razón desconocida.';
 $lang['Check for upgrade'] = 'Última versión';
 $lang['Comments for all'] = 'Comentarios para todos';
@@ -103,12 +103,12 @@ $lang['Guests'] = 'Invitados';
 $lang['History'] = 'histórico';
 $lang['Informations'] = 'Informaciones';
 $lang['Install'] = 'Instalar';
-$lang['Link all category elements to a new category'] = 'Vincular todos los elementos de la categoría con una nueva categoría';
-$lang['Link all category elements to some existing categories'] = 'Vincular todos los elementos de la categoría existentes';
+$lang['Link all album elements to a new album'] = 'Vincular todos los elementos de la categoría con una nueva categoría';
+$lang['Link all album elements to some existing albums'] = 'Vincular todos los elementos de la categoría existentes';
 $lang['Linked albums'] = 'Categorías asociadas';
 $lang['Lock gallery'] = 'Cerrar la galería';
 $lang['Maintenance'] = 'Mantenimiento';
-$lang['Manage permissions for a category'] = 'Administrar las autorizaciones para una categoría';
+$lang['Edit album permissions'] = 'Administrar las autorizaciones para una categoría';
 $lang['Manage permissions for group "%s"'] = 'Administrar las autorizaciones para el grupo "%s"';
 $lang['Manage permissions for user "%s"'] = 'Administrar las autorizaciones para el usuario "%s"';
 $lang['Manage tags'] = 'Administrar las etiquetas';
@@ -156,7 +156,7 @@ $lang['Representative'] = 'Representante';
 $lang['Represents'] = 'Representa';
 $lang['Save order'] = 'Salvaguardar la orden';
 $lang['Save to permalink history'] = 'Salvaguardar en el histórico de los lazos permanentes';
-$lang['Select at least one category'] = 'Seleccionar por lo menos una categoría';
+$lang['Select at least one album'] = 'Seleccionar por lo menos una categoría';
 $lang['Select at least one picture'] = 'Seleccionar por lo menos una imagen';
 $lang['Select at least one user'] = 'Seleccionar por lo menos a un usuario';
 $lang['Show info'] = 'Mostrar las informaciones';
@@ -179,22 +179,21 @@ $lang['Validate All'] = 'Validar todo';
 $lang['Validate'] = 'Validar';
 $lang['Validation'] = 'Validación';
 $lang['Version'] = 'Versión';
-$lang['Virtual categories movement'] = 'Desplazamiento de categorías virtuales';
-$lang['Virtual categories to move'] = 'Categorías virtuales que hay que desplazar';
+$lang['Virtual albums to move'] = 'Categorías virtuales que hay que desplazar';
 $lang['Virtual album name'] = 'Nombre de la categoría virtual';
 $lang['Webmaster cannot be deleted'] = 'El webmestre no puede ser suprimido';
 $lang['You are running on development sources, no check possible.'] = 'Usted trabaja con las fuentes de desarrollo, imposible verificar la última versión.';
 $lang['You cannot delete your account'] = "Usted no puede suprimir su cuenta";
-$lang['You cannot move a category in its own sub category'] = 'Usted no puede desplazar una categoría en su propia subcategoría';
+$lang['You cannot move a album in its own sub album'] = 'Usted no puede desplazar una categoría en su propia subcategoría';
 $lang['You need to confirm deletion'] = 'Usted debe confirmar la supresión';
 $lang['add tags'] = 'Añadir las etiquetas';
 $lang['Adviser'] = 'Consejero';
-$lang['associate to category'] = 'asociar con la categoría';
+$lang['Associate to album'] = 'asociar con la categoría';
 $lang['associate to group'] = 'asociar con grupo';
 $lang['Authorized'] = 'Autorizados';
 $lang['Add a virtual album'] = 'Añadir una categoría virtual';
 $lang['Authorize users to add comments on selected categories'] = 'Autorizar a los usuarios a añadir comentarios en las categorías seleccionadas';
-$lang['The name of a category should not be empty'] = 'El nombre de la categoría no debe estar vacío';
+$lang['The name of an album must not be empty'] = 'El nombre de la categoría no debe estar vacío';
 $lang['Lock albums'] = 'Cerrar las categorías';
 $lang['Private'] = 'Categoría particular';
 $lang['Public'] = 'Categoría pública';
@@ -216,11 +215,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = 'El
 $lang['Configuration'] = 'Configuración';
 $lang['confirm'] = 'Confirmar';
 $lang['Date'] = 'Fecha';
-$lang['delete category'] = 'Suprimir la categoría';
-$lang['dissociate from category'] = 'Disociar de la categoría';
+$lang['delete album'] = 'Suprimir la categoría';
+$lang['Dissociate from album'] = 'Disociar de la categoría';
 $lang['dissociate from group'] = 'Disociar del grupo';
-$lang['edit category permissions'] = 'Modificar los permisos de la categoría';
-$lang['Category informations updated successfully.'] = 'Las informaciones de la categoría han sido actualizadas con éxito.';
+$lang['edit album permissions'] = 'Modificar los permisos de la categoría';
+$lang['Album updated successfully'] = 'Las informaciones de la categoría han sido actualizadas con éxito.';
 $lang['Authorize upload'] = 'Autorizar el añadido de imágenes';
 $lang['elements per page'] = 'Elementos por página';
 $lang['elements'] = 'Elementos';
@@ -238,13 +237,13 @@ $lang['The name of a group must not contain " or \' or be empty.'] = 'El nombre
 $lang['This name is already used by another group.'] = 'Este nombre es ya utilizado por otro grupo.';
 $lang[''] = '';
 $lang['High definition'] = 'Alta definición';
-$lang['jump to category'] = 'Ir en la categoría';
+$lang['jump to album'] = 'Ir en la categoría';
 $lang['jump to image'] = 'Ir a la imagen';
 $lang['leave'] = 'dejar';
 $lang['Lock'] = 'Cerrar';
 $lang['Locked'] = 'Cerrado';
-$lang['manage category elements'] = 'administrar los elementos de la categoría';
-$lang['manage sub-categories'] = 'administrar las subcategorías';
+$lang['manage album elements'] = 'administrar los elementos de la categoría';
+$lang['manage sub-albums'] = 'administrar las subcategorías';
 $lang['Manage'] = 'Administrar';
 $lang['maximum height'] = 'Altura máxima';
 $lang['maximum width'] = 'Anchura máxima';
@@ -389,7 +388,7 @@ $lang['for this file format'] = 'para este tamaño de fichero';
 $lang['unit mode'] = 'modo unitario';
 $lang['Unlocked'] = 'quitado el cierre';
 $lang['unset'] = 'Vaciar';
-$lang['Update categories informations'] = 'Actualizar las informaciones de las categorías';
+$lang['Update albums informations'] = 'Actualizar las informaciones de las categorías';
 $lang['Update images informations'] = 'Actualizar las informaciones de las imágenes';
 $lang['Synchronize'] = 'Sincronizar';
 $lang['reduce to single existing categories'] = 'Únicamente tratar una categoría';
@@ -644,7 +643,7 @@ $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Cr
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Dé los autorizaciones en escritura (chmod 777) al repertorio "%s"  en la raíz de su instalación Piwigo';
 $lang['existing category'] = 'categoría existente';
 $lang['create a new category'] = 'crear una nueva categoría';
-$lang['Category name'] = 'Nombre de la categoría';
+$lang['Album name'] = 'Nombre de la categoría';
 $lang['Category "%s" has been added'] = 'La categoría "%s" ha sido añadida';
 $lang['Uploaded Photos'] = 'Fotos añadidas';
 $lang['%d photos uploaded'] = '%d fotos añadidas';
diff --git a/language/fr_CA/admin.lang.php b/language/fr_CA/admin.lang.php
index adae42655..44c532530 100644
--- a/language/fr_CA/admin.lang.php
+++ b/language/fr_CA/admin.lang.php
@@ -67,7 +67,7 @@ $lang['Caddie management'] = "Gestion du panier";
 $lang['Caddie'] = "Panier";
 $lang['Categories authorized thanks to group associations'] = "Catégories accessibles grâce à l'appartenance aux groupes";
 $lang['Album manual order was saved'] = "L'ordre manuel des catégories a été sauvegardé";
-$lang['Category elements associated to the following categories: %s'] = "Les éléments de la catégorie ont été associés aux catégories suivantes : %s";
+$lang['Album elements associated to the following albums: %s'] = "Les éléments de la catégorie ont été associés aux catégories suivantes : %s";
 $lang['Check for upgrade failed for unknown reasons.'] = "La vérification de la dernière version sur le serveur a échouée pour une raison inconnue.";
 $lang['Check for upgrade'] = "Dernière version ?";
 $lang['Comments for all'] = "Commentaires pour tous";
@@ -106,12 +106,12 @@ $lang['Guests'] = "Invités";
 $lang['History'] = "Historique";
 $lang['Informations'] = "Informations";
 $lang['Install'] = "Installer";
-$lang['Link all category elements to a new category'] = "Associer tous les éléments de la catégorie à une nouvelle catégorie";
-$lang['Link all category elements to some existing categories'] = "Associer tous les éléments de la catégorie à des catégories existantes";
+$lang['Link all album elements to a new album'] = "Associer tous les éléments de la catégorie à une nouvelle catégorie";
+$lang['Link all album elements to some existing albums'] = "Associer tous les éléments de la catégorie à des catégories existantes";
 $lang['Linked albums'] = "Catégories associées";
 $lang['Lock gallery'] = "Verrouiller la galerie";
 $lang['Maintenance'] = "Maintenance";
-$lang['Manage permissions for a category'] = "Gérer les permissions pour une catégorie";
+$lang['Edit album permissions'] = "Gérer les permissions pour une catégorie";
 $lang['Manage permissions for group "%s"'] = "Gérer les permissions pour le groupe \"%s\"";
 $lang['Manage permissions for user "%s"'] = "Gérer les permissions pour l'utilisateur \"%s\"";
 $lang['Manage tags'] = "Gérer les mots clés";
@@ -159,7 +159,7 @@ $lang['Representative'] = "Représentant";
 $lang['Represents'] = "Représente";
 $lang['Save order'] = "Sauvegarder l'ordre";
 $lang['Save to permalink history'] = "Sauvegarder dans l'historique des liens permanents";
-$lang['Select at least one category'] = "Sélectionner au moins une catégorie";
+$lang['Select at least one album'] = "Sélectionner au moins une catégorie";
 $lang['Select at least one picture'] = "Sélectionner au moins une image";
 $lang['Select at least one user'] = "Sélectionner au moins un utilisateur";
 $lang['Show info'] = "Montrer les informations";
@@ -182,22 +182,21 @@ $lang['Validate All'] = "Tout valider";
 $lang['Validate'] = "Valider";
 $lang['Validation'] = "Validation";
 $lang['Version'] = "Version";
-$lang['Virtual categories movement'] = "Déplacement de catégories virtuelles";
-$lang['Virtual categories to move'] = "Catégories virtuelles à déplacer";
+$lang['Virtual albums to move'] = "Catégories virtuelles à déplacer";
 $lang['Virtual album name'] = "Nom de la catégorie virtuelle";
 $lang['Webmaster cannot be deleted'] = "Le webmestre ne peut pas être supprimé";
 $lang['You are running on development sources, no check possible.'] = "Vous travaillez avec les sources de développement, impossible de vérifier la dernière version.";
 $lang['You cannot delete your account'] = "Vous ne pouvez pas supprimer votre compte";
-$lang['You cannot move a category in its own sub category'] = "Vous ne pouvez pas déplacer une catégorie dans sa propre sous-catégorie";
+$lang['You cannot move a album in its own sub album'] = "Vous ne pouvez pas déplacer une catégorie dans sa propre sous-catégorie";
 $lang['You need to confirm deletion'] = "Vous devez confirmer la suppression";
 $lang['add tags'] = "Ajouter les tags";
 $lang['Adviser'] = "Conseiller";
-$lang['associate to category'] = "Associer à la catégorie";
+$lang['Associate to album'] = "Associer à la catégorie";
 $lang['associate to group'] = "Associer au groupe";
 $lang['Authorized'] = "Autorisés";
 $lang['Add a virtual album'] = "Ajouter une catégorie virtuelle";
 $lang['Authorize users to add comments on selected categories'] = "Autoriser les utilisateurs à ajouter des commentaires dans les catégories sélectionnées";
-$lang['The name of a category should not be empty'] = "Le nom de la catégorie ne doit pas être vide";
+$lang['The name of an album must not be empty'] = "Le nom de la catégorie ne doit pas être vide";
 $lang['Lock albums'] = "Verrouiller les catégories";
 $lang['Private'] = "Catégorie privée";
 $lang['Public'] = "Catégorie publique";
@@ -219,11 +218,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = "Le
 $lang['Configuration'] = "Configuration";
 $lang['confirm'] = "Confirmer";
 $lang['Date'] = "Date";
-$lang['delete category'] = "supprimer la catégorie";
-$lang['dissociate from category'] = "Dissocier de la catégorie";
+$lang['delete album'] = "supprimer la catégorie";
+$lang['Dissociate from album'] = "Dissocier de la catégorie";
 $lang['dissociate from group'] = "Dissocier du groupe";
-$lang['edit category permissions'] = "Modifier les permissions de la catégorie";
-$lang['Category informations updated successfully.'] = "Les informations de la catégorie ont été mises à jour avec succès.";
+$lang['edit album permissions'] = "Modifier les permissions de la catégorie";
+$lang['Album updated successfully'] = "Les informations de la catégorie ont été mises à jour avec succès.";
 $lang['Authorize upload'] = "Autoriser l'ajout d'images";
 $lang['elements per page'] = "Nombre d'éléments par page à afficher";
 $lang['elements'] = "éléments";
@@ -242,13 +241,13 @@ $lang['This name is already used by another group.'] = "Ce nom est déjà utilis
 $lang['Groups'] = "Groupes";
 $lang[''] = "";
 $lang['High definition'] = "Haute définition";
-$lang['jump to category'] = "Se rendre dans la catégorie";
+$lang['jump to album'] = "Se rendre dans la catégorie";
 $lang['jump to image'] = "Se rendre à l'image";
 $lang['leave'] = "laisser";
 $lang['Lock'] = "Verrouiller";
 $lang['Locked'] = "Verrouillées";
-$lang['manage category elements'] = "Gérer les éléments de la catégorie";
-$lang['manage sub-categories'] = "Gérer les sous-catégories";
+$lang['manage album elements'] = "Gérer les éléments de la catégorie";
+$lang['manage sub-albums'] = "Gérer les sous-catégories";
 $lang['Manage'] = "Gérer";
 $lang['maximum height'] = "Hauteur maximum";
 $lang['maximum width'] = "Largeur maximum";
@@ -399,7 +398,7 @@ $lang['for this file format'] = "pour ce format de fichier";
 $lang['unit mode'] = "Mode unitaire";
 $lang['Unlocked'] = "Déverrouillées";
 $lang['unset'] = "vider";
-$lang['Update categories informations'] = "Mettre à jour les informations des catégories";
+$lang['Update albums informations'] = "Mettre à jour les informations des catégories";
 $lang['Update images informations'] = "Mettre à jour les informations des images";
 $lang['Synchronize'] = "Synchroniser";
 $lang['reduce to single existing categories'] = "Traiter uniquement une catégorie";
@@ -657,7 +656,7 @@ $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Cr
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Donnez les droits en écriture (chmod 777) sur le répertoire "%s" à la racine de votre installation Piwigo';
 $lang['existing category'] = 'catégorie existante';
 $lang['create a new category'] = 'créer une nouvelle catégorie';
-$lang['Category name'] = 'Nom de la catégorie';
+$lang['Album name'] = 'Nom de la catégorie';
 $lang['Category "%s" has been added'] = 'La catégorie "%s" a été ajoutée';
 $lang['Uploaded Photos'] = 'Photos ajoutées ';
 $lang['%d photos uploaded'] = '%d photos ajoutées';
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 06c91c68c..7d3eca563 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -67,7 +67,7 @@ $lang['Caddie management'] = "Gestion du panier";
 $lang['Caddie'] = "Panier";
 $lang['Categories authorized thanks to group associations'] = "Catégories accessibles grâce à l'appartenance aux groupes";
 $lang['Album manual order was saved'] = "L'ordre manuel des catégories a été sauvegardé";
-$lang['Category elements associated to the following categories: %s'] = "Les éléments de la catégorie ont été associés aux catégories suivantes : %s";
+$lang['Album elements associated to the following albums: %s'] = "Les éléments de la catégorie ont été associés aux catégories suivantes : %s";
 $lang['Check for upgrade failed for unknown reasons.'] = "La vérification de la dernière version sur le serveur a échouée pour une raison inconnue.";
 $lang['Check for upgrade'] = "Dernière version ?";
 $lang['Comments for all'] = "Commentaires pour tous";
@@ -105,12 +105,12 @@ $lang['Guests'] = "Invités";
 $lang['History'] = "Historique";
 $lang['Informations'] = "Informations";
 $lang['Install'] = "Installer";
-$lang['Link all category elements to a new category'] = "Associer tous les éléments de la catégorie à une nouvelle catégorie";
-$lang['Link all category elements to some existing categories'] = "Associer tous les éléments de la catégorie à des catégories existantes";
+$lang['Link all album elements to a new album'] = "Associer tous les éléments de la catégorie à une nouvelle catégorie";
+$lang['Link all album elements to some existing albums'] = "Associer tous les éléments de la catégorie à des catégories existantes";
 $lang['Linked albums'] = "Catégories associées";
 $lang['Lock gallery'] = "Verrouiller la galerie";
 $lang['Maintenance'] = "Maintenance";
-$lang['Manage permissions for a category'] = "Gérer les permissions pour une catégorie";
+$lang['Edit album permissions'] = "Gérer les permissions pour une catégorie";
 $lang['Manage permissions for group "%s"'] = "Gérer les permissions pour le groupe \"%s\"";
 $lang['Manage permissions for user "%s"'] = "Gérer les permissions pour l'utilisateur \"%s\"";
 $lang['Manage tags'] = "Gérer les tags";
@@ -158,7 +158,7 @@ $lang['Representative'] = "Représentant";
 $lang['Represents'] = "Représente";
 $lang['Save order'] = "Sauvegarder l'ordre";
 $lang['Save to permalink history'] = "Sauvegarder dans l'historique des liens permanents";
-$lang['Select at least one category'] = "Sélectionner au moins une catégorie";
+$lang['Select at least one album'] = "Sélectionner au moins une catégorie";
 $lang['Select at least one picture'] = "Sélectionner au moins une image";
 $lang['Select at least one user'] = "Sélectionner au moins un utilisateur";
 $lang['Show info'] = "Montrer les informations";
@@ -181,22 +181,21 @@ $lang['Validate All'] = "Tout valider";
 $lang['Validate'] = "Valider";
 $lang['Validation'] = "Validation";
 $lang['Version'] = "Version";
-$lang['Virtual categories movement'] = "Déplacement de catégories virtuelles";
-$lang['Virtual categories to move'] = "Catégories virtuelles à déplacer";
+$lang['Virtual albums to move'] = "Catégories virtuelles à déplacer";
 $lang['Virtual album name'] = "Nom de la catégorie virtuelle";
 $lang['Webmaster cannot be deleted'] = "Le webmestre ne peut pas être supprimé";
 $lang['You are running on development sources, no check possible.'] = "Vous travaillez avec les sources de développement, impossible de vérifier la dernière version.";
 $lang['You cannot delete your account'] = "Vous ne pouvez pas supprimer votre compte";
-$lang['You cannot move a category in its own sub category'] = "Vous ne pouvez pas déplacer une catégorie dans sa propre sous-catégorie";
+$lang['You cannot move a album in its own sub album'] = "Vous ne pouvez pas déplacer une catégorie dans sa propre sous-catégorie";
 $lang['You need to confirm deletion'] = "Vous devez confirmer la suppression";
 $lang['add tags'] = "Ajouter les tags";
 $lang['Adviser'] = "Conseiller";
-$lang['associate to category'] = "Associer à la catégorie";
+$lang['Associate to album'] = "Associer à la catégorie";
 $lang['associate to group'] = "Associer au groupe";
 $lang['Authorized'] = "Autorisés";
 $lang['Add a virtual album'] = "Ajouter une catégorie virtuelle";
 $lang['Authorize users to add comments on selected categories'] = "Autoriser les utilisateurs à ajouter des commentaires dans les catégories sélectionnées";
-$lang['The name of a category should not be empty'] = "Le nom de la catégorie ne doit pas être vide";
+$lang['The name of an album must not be empty'] = "Le nom de la catégorie ne doit pas être vide";
 $lang['Lock albums'] = "Verrouiller les catégories";
 $lang['Private'] = "Catégorie privée";
 $lang['Public'] = "Catégorie publique";
@@ -218,11 +217,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = "Le
 $lang['Configuration'] = "Configuration";
 $lang['confirm'] = "Confirmer";
 $lang['Date'] = "Date";
-$lang['delete category'] = "supprimer la catégorie";
-$lang['dissociate from category'] = "Dissocier de la catégorie";
+$lang['delete album'] = "supprimer la catégorie";
+$lang['Dissociate from album'] = "Dissocier de la catégorie";
 $lang['dissociate from group'] = "Dissocier du groupe";
-$lang['edit category permissions'] = "Modifier les permissions de la catégorie";
-$lang['Category informations updated successfully.'] = "Les informations de la catégorie ont été mises à jour avec succès.";
+$lang['edit album permissions'] = "Modifier les permissions de la catégorie";
+$lang['Album updated successfully'] = "Les informations de la catégorie ont été mises à jour avec succès.";
 $lang['Authorize upload'] = "Autoriser l'ajout d'images";
 $lang['elements per page'] = "Nombre d'éléments par page à afficher";
 $lang['elements'] = "éléments";
@@ -240,13 +239,13 @@ $lang['The name of a group must not contain " or \' or be empty.'] = "Le nom du
 $lang['This name is already used by another group.'] = "Ce nom est déjà utilisé par un autre groupe.";
 $lang[''] = "";
 $lang['High definition'] = "Haute définition";
-$lang['jump to category'] = "Se rendre dans la catégorie";
+$lang['jump to album'] = "Se rendre dans la catégorie";
 $lang['jump to image'] = "Se rendre à l'image";
 $lang['leave'] = "laisser";
 $lang['Lock'] = "Verrouiller";
 $lang['Locked'] = "Verrouillées";
-$lang['manage category elements'] = "Gérer les éléments de la catégorie";
-$lang['manage sub-categories'] = "Gérer les sous-catégories";
+$lang['manage album elements'] = "Gérer les éléments de la catégorie";
+$lang['manage sub-albums'] = "Gérer les sous-catégories";
 $lang['Manage'] = "Gérer";
 $lang['maximum height'] = "Hauteur maximum";
 $lang['maximum width'] = "Largeur maximum";
@@ -394,7 +393,7 @@ $lang['for this file format'] = "pour ce format de fichier";
 $lang['unit mode'] = "Mode unitaire";
 $lang['Unlocked'] = "Déverrouillées";
 $lang['unset'] = "vider";
-$lang['Update categories informations'] = "Mettre à jour les informations des catégories";
+$lang['Update albums informations'] = "Mettre à jour les informations des catégories";
 $lang['Update images informations'] = "Mettre à jour les informations des images";
 $lang['Synchronize'] = "Synchroniser";
 $lang['reduce to single existing categories'] = "Traiter uniquement une catégorie";
@@ -646,7 +645,7 @@ $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Cr
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Donnez les droits en écriture (chmod 777) sur le répertoire "%s" à la racine de votre installation Piwigo';
 $lang['existing category'] = 'catégorie existante';
 $lang['create a new category'] = 'créer une nouvelle catégorie';
-$lang['Category name'] = 'Nom de la catégorie';
+$lang['Album name'] = 'Nom de la catégorie';
 $lang['Category "%s" has been added'] = 'La catégorie "%s" a été ajoutée';
 $lang['Uploaded Photos'] = 'Photos ajoutées ';
 $lang['%d photos uploaded'] = '%d photos ajoutées';
diff --git a/language/hr_HR/admin.lang.php b/language/hr_HR/admin.lang.php
index 2752e86ce..ba07f9ddd 100644
--- a/language/hr_HR/admin.lang.php
+++ b/language/hr_HR/admin.lang.php
@@ -65,7 +65,7 @@ $lang['Caddie management'] = 'Uprava ladice';
 $lang['Caddie'] = 'Ladica';
 $lang['Categories authorized thanks to group associations'] = 'Skupine ovjerene zahvaljujući grupnoj povezanosti';
 $lang['Album manual order was saved'] = 'Stvarni redoslijed skupina je pohranjen';
-$lang['Category elements associated to the following categories: %s'] = 'Stavke skupine povezane su sa slijedećim skupinama: %s';
+$lang['Album elements associated to the following albums: %s'] = 'Stavke skupine povezane su sa slijedećim skupinama: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'Provjera nadogradnje neuspješna iz nepoznatog razloga.';
 $lang['Check for upgrade'] = 'Provjera nadogradnje';
 $lang['Comments for all'] = 'Komentari za sve';
@@ -103,12 +103,12 @@ $lang['Guests'] = 'Gostiju';
 $lang['History'] = 'Povijest';
 $lang['Informations'] = 'Obavijesti';
 $lang['Install'] = 'Ugradi';
-$lang['Link all category elements to a new category'] = 'Poveži sve stavke skupine sa novom skupinom';
-$lang['Link all category elements to some existing categories'] = 'Poveži sve stavke skupine sa nekom postojećom skupinom';
+$lang['Link all album elements to a new album'] = 'Poveži sve stavke skupine sa novom skupinom';
+$lang['Link all album elements to some existing albums'] = 'Poveži sve stavke skupine sa nekom postojećom skupinom';
 $lang['Linked albums'] = 'Povezane skupine';
 $lang['Lock gallery'] = 'Zaključaj galeriju';
 $lang['Maintenance'] = 'Održavanje';
-$lang['Manage permissions for a category'] = 'Upravljanje ovlastima za skupinu';
+$lang['Edit album permissions'] = 'Upravljanje ovlastima za skupinu';
 $lang['Manage permissions for group "%s"'] = 'Upravljanje ovlastima za grupu "%s"';
 $lang['Manage permissions for user "%s"'] = 'Upravljanje ovlastima za korisnika "%s"';
 $lang['Manage tags'] = 'Upravljanje tagovima';
@@ -155,7 +155,7 @@ $lang['Representative'] = 'Predstavljeno';
 $lang['Represents'] = 'Predstavlja';
 $lang['Save order'] = 'Redoslijed pohrane';
 $lang['Save to permalink history'] = 'Pohrani u povjest stalnih poveznica';
-$lang['Select at least one category'] = 'Odaberite najmanje jednu skupinu';
+$lang['Select at least one album'] = 'Odaberite najmanje jednu skupinu';
 $lang['Select at least one picture'] = 'Odaberite najmanje jednu sliku';
 $lang['Select at least one user'] = 'Odaberite najmanje jednog korisnika';
 $lang['Show info'] = 'Prikaz podataka';
@@ -178,22 +178,21 @@ $lang['Validate All'] = 'Ovjeri Sve';
 $lang['Validate'] = 'Ovjeri';
 $lang['Validation'] = 'Ovjera';
 $lang['Version'] = 'Inačica';
-$lang['Virtual categories movement'] = 'Premještanje nestvarnih skupina';
-$lang['Virtual categories to move'] = 'Nestvarne skupine za premještaj';
+$lang['Virtual albums to move'] = 'Nestvarne skupine za premještaj';
 $lang['Virtual album name'] = 'Naziv nestvarne skupine';
 $lang['Webmaster cannot be deleted'] = 'Webmaster ne može biti izbrisan';
 $lang['You are running on development sources, no check possible.'] = 'Vi koristite razvojni izvorni kod, provjera nemoguća.';
 $lang['You cannot delete your account'] = "Ne možete izbrisati svoj račun";
-$lang['You cannot move a category in its own sub category'] = 'Ne možete premjestiti skupinu u njenu vlastitu podskupinu';
+$lang['You cannot move a album in its own sub album'] = 'Ne možete premjestiti skupinu u njenu vlastitu podskupinu';
 $lang['You need to confirm deletion'] = 'trebate potvrditi brisanje';
 $lang['add tags'] = 'dodaj tagove';
 $lang['Adviser'] = 'Savjetnik';
-$lang['associate to category'] = 'poveži sa skupinom';
+$lang['Associate to album'] = 'poveži sa skupinom';
 $lang['associate to group'] = 'poveži sa grupom';
 $lang['Authorized'] = 'Ovlašteno';
 $lang['Add a virtual album'] = 'Dodaj nestvarnu skupinu';
 $lang['Authorize users to add comments on selected categories'] = 'Ovlastite korisnike za davanje komentara u odabranim skupinama';
-$lang['The name of a category should not be empty'] = 'Naziv skupine ne bi trebao biti prazan';
+$lang['The name of an album must not be empty'] = 'Naziv skupine ne bi trebao biti prazan';
 $lang['Lock albums'] = 'Zaključaj skupine';
 $lang['Private'] = 'Osobna skupina';
 $lang['Public'] = 'Javna skupina';
@@ -215,11 +214,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = 'Bro
 $lang['Configuration'] = 'Postavljanje';
 $lang['confirm'] = 'potvrdi';
 $lang['Date'] = 'Nadnevak';
-$lang['delete category'] = 'izbriši skupinu';
-$lang['dissociate from category'] = 'odspoji od skupine';
+$lang['delete album'] = 'izbriši skupinu';
+$lang['Dissociate from album'] = 'odspoji od skupine';
 $lang['dissociate from group'] = 'odspoji od grupe';
-$lang['edit category permissions'] = 'uredi ovlasti skupine';
-$lang['Category informations updated successfully.'] = 'Podaci skupine uspješno obnovljeni.';
+$lang['edit album permissions'] = 'uredi ovlasti skupine';
+$lang['Album updated successfully'] = 'Podaci skupine uspješno obnovljeni.';
 $lang['Authorize upload'] = 'Odobri prebačaj';
 $lang['elements per page'] = 'stavaka po stranici';
 $lang['elements'] = 'stavke';
@@ -236,13 +235,13 @@ $lang['group'] = 'grupa';
 $lang['The name of a group must not contain " or \' or be empty.'] = 'Naziv grupe ne može sadržavati  " ili \' ili biti prazan.';
 $lang['This name is already used by another group.'] = 'Ovaj naziv već koristi druga grupa.';
 $lang['High definition'] = 'Visoka razlučljivost';
-$lang['jump to category'] = 'skok u skupina';
+$lang['jump to album'] = 'skok u skupina';
 $lang['jump to image'] = 'skok na sliku';
 $lang['leave'] = 'ostavi';
 $lang['Lock'] = 'Zaključaj';
 $lang['Locked'] = 'Zaključanp';
-$lang['manage category elements'] = 'upravljanje stavkama skupine';
-$lang['manage sub-categories'] = 'upravljanje podskupinama';
+$lang['manage album elements'] = 'upravljanje stavkama skupine';
+$lang['manage sub-albums'] = 'upravljanje podskupinama';
 $lang['Manage'] = 'Uprava';
 $lang['maximum height'] = 'najveća visina';
 $lang['maximum width'] = 'najveća širina';
@@ -386,7 +385,7 @@ $lang['for this file format'] = 'za ovu vrstu zapisa';
 $lang['unit mode'] = 'jedinični način';
 $lang['Unlocked'] = 'Otključano';
 $lang['unset'] = 'razdešeno';
-$lang['Update categories informations'] = 'Obnovi podatke o skupinama';
+$lang['Update albums informations'] = 'Obnovi podatke o skupinama';
 $lang['Update images informations'] = 'Obnovi podatke o slikama';
 $lang['Synchronize'] = 'Uskladi';
 $lang['reduce to single existing categories'] = 'suzi na jednu postojeću skupinu-e';
@@ -642,7 +641,7 @@ $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Iz
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Dozvoli pravo upisa (chmod 777) za "%s" mapu u korijenu Piwigo galerije';
 $lang['existing category'] = 'postojeća skupina';
 $lang['create a new category'] = 'stvori novu skupinu';
-$lang['Category name'] = 'Naziv skupine';
+$lang['Album name'] = 'Naziv skupine';
 $lang['Category "%s" has been added'] = 'Skupina "%s" je dodana';
 $lang['Uploaded Photos'] = 'Prebačene Slike';
 $lang['%d photos uploaded'] = '%d slika prebačeno';
diff --git a/language/hr_HR/help/maintenance.html b/language/hr_HR/help/maintenance.html
index 698afaf5d..439fe38b3 100644
--- a/language/hr_HR/help/maintenance.html
+++ b/language/hr_HR/help/maintenance.html
@@ -24,7 +24,7 @@ information from database make you save disk space.</p>
 
 <ul>
 
-  <li><strong>Update categories informations:</strong> For each category,
+  <li><strong>Update albums informations:</strong> For each category,
   informations to update or control are the following : list of parent
   categories, number of pictures, date of the last picture, position among
   brother categories, position among all categories. This action also checks
diff --git a/language/hu_HU/admin.lang.php b/language/hu_HU/admin.lang.php
index a723c3bff..0104db214 100644
--- a/language/hu_HU/admin.lang.php
+++ b/language/hu_HU/admin.lang.php
@@ -65,7 +65,7 @@ $lang['Caddie management'] = 'Kosár kezelése';
 $lang['Caddie'] = 'Kosár';
 $lang['Categories authorized thanks to group associations'] = 'A kategóriák csoport tagsága';
 $lang['Album manual order was saved'] = 'Kategóriák sorrendjének mentése megtörtént';
-$lang['Category elements associated to the following categories: %s'] = 'A kategória elemeinek a következő kategóriához rendelése: %s';
+$lang['Album elements associated to the following albums: %s'] = 'A kategória elemeinek a következő kategóriához rendelése: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'A program frissítése ismeretlen okból nem sikerült.';
 $lang['Check for upgrade'] = 'Frissítés keresése';
 $lang['Comments for all'] = 'Bárki hozzászólhat';
@@ -103,12 +103,12 @@ $lang['Guests'] = 'Vendégek';
 $lang['History'] = 'Statisztikák';
 $lang['Informations'] = 'Információk';
 $lang['Install'] = 'Telepítés';
-$lang['Link all category elements to a new category'] = 'A kategória összes elemének új kategóriához rendelése';
-$lang['Link all category elements to some existing categories'] = 'A kategória összes elemének már meglévő kategóriához rendelése';
+$lang['Link all album elements to a new album'] = 'A kategória összes elemének új kategóriához rendelése';
+$lang['Link all album elements to some existing albums'] = 'A kategória összes elemének már meglévő kategóriához rendelése';
 $lang['Linked albums'] = 'Linkelt kategóriák';
 $lang['Lock gallery'] = 'Galéria lezárása';
 $lang['Maintenance'] = 'Karbantartás';
-$lang['Manage permissions for a category'] = 'Kategória jogosultságainak kezelése';
+$lang['Edit album permissions'] = 'Kategória jogosultságainak kezelése';
 $lang['Manage permissions for group "%s"'] = '"%s" csoport jogosultságainak kezelése';
 $lang['Manage permissions for user "%s"'] = '"%s" felhasználó jogosultságainak kezelése';
 $lang['Manage tags'] = 'Címkék kezelése';
@@ -156,7 +156,7 @@ $lang['Representative'] = 'Reprezentatív';
 $lang['Represents'] = 'Reprezentál';
 $lang['Save order'] = 'Sorrend mentése';
 $lang['Save to permalink history'] = 'Közvetlen link előzmények mentése';
-$lang['Select at least one category'] = 'Legalább egy kategóriát ki kell választani';
+$lang['Select at least one album'] = 'Legalább egy kategóriát ki kell választani';
 $lang['Select at least one picture'] = 'Legalább egy képet ki kell választani';
 $lang['Select at least one user'] = 'Legalább egy felhasználót ki kell választani';
 $lang['Show info'] = 'Információ megjelenítése';
@@ -178,22 +178,21 @@ $lang['Validate All'] = 'Összes engedélyezése';
 $lang['Validate'] = 'Engedélyezés';
 $lang['Validation'] = 'Engedélyezés szükséges';
 $lang['Version'] = 'Verzió';
-$lang['Virtual categories movement'] = 'Virtuális kategóriák áthelyezése';
-$lang['Virtual categories to move'] = 'Virtuális kategóriák kijelölése áthelyezésre';
+$lang['Virtual albums to move'] = 'Virtuális kategóriák kijelölése áthelyezésre';
 $lang['Virtual album name'] = 'Virtuális kategória neve';
 $lang['Webmaster cannot be deleted'] = 'Na jó...azért a webmestert ne töröljük...';
 $lang['You are running on development sources, no check possible.'] = 'Ez egy fejlesztői változat, keresés lehetetlen.';
 $lang['You cannot delete your account'] = "Nem törölheti a fiókját";
-$lang['You cannot move a category in its own sub category'] = 'A kategóriát lehetetlen az alkategóriájába helyezni';
+$lang['You cannot move a album in its own sub album'] = 'A kategóriát lehetetlen az alkategóriájába helyezni';
 $lang['You need to confirm deletion'] = 'A törléshez megerősítés szükséges';
 $lang['add tags'] = 'Címke hozzáadása';
 $lang['Adviser'] = 'Tanácsadó';
-$lang['associate to category'] = 'Hozzárendelés kategóriához';
+$lang['Associate to album'] = 'Hozzárendelés kategóriához';
 $lang['associate to group'] = 'Hozzárendelés csoporthoz';
 $lang['Authorized'] = 'Engedélyezve';
 $lang['Add a virtual album'] = 'Virtuális kategória hozzáadása';
 $lang['Authorize users to add comments on selected categories'] = 'Hozzászólás engedélyezése a kiválasztott kategóriákhoz';
-$lang['The name of a category should not be empty'] = 'A kategória nevét meg kell adni';
+$lang['The name of an album must not be empty'] = 'A kategória nevét meg kell adni';
 $lang['Lock albums'] = 'Kategória lezárása';
 $lang['Private'] = 'Privát kategória';
 $lang['Public'] = 'Nyilvános kategória';
@@ -214,11 +213,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = 'A f
 $lang['Configuration'] = 'Beállítások';
 $lang['confirm'] = 'Megerősítés';
 $lang['Date'] = 'Dátum';
-$lang['delete category'] = 'Kategória törlése';
-$lang['dissociate from category'] = 'Eltávolítás a kategóriából';
+$lang['delete album'] = 'Kategória törlése';
+$lang['Dissociate from album'] = 'Eltávolítás a kategóriából';
 $lang['dissociate from group'] = 'Eltávolítás a csoportból';
-$lang['edit category permissions'] = 'Kategóriák hozzáféréseinek módosítása';
-$lang['Category informations updated successfully.'] = 'A kategória információinak módosítása megtörtént.';
+$lang['edit album permissions'] = 'Kategóriák hozzáféréseinek módosítása';
+$lang['Album updated successfully'] = 'A kategória információinak módosítása megtörtént.';
 $lang['Authorize upload'] = 'Feltöltés engedélyezése';
 $lang['elements per page'] = 'Képek száma oldalanként';
 $lang['elements'] = 'Kép';
@@ -235,13 +234,13 @@ $lang['group'] = 'Csoport';
 $lang['The name of a group must not contain " or \' or be empty.'] = 'A csoportnév nem tartalmazhat " vagy \' karaktert, vagy nem lehet üres.';
 $lang['This name is already used by another group.'] = 'Ez a név már használatban van a másik csoportban.';
 $lang['High definition'] = 'Kiemelt hozzáférés';
-$lang['jump to category'] = 'Kategóriához ugrás';
+$lang['jump to album'] = 'Kategóriához ugrás';
 $lang['jump to image'] = 'Képhez ugrás';
 $lang['leave'] = 'Nem változtat';
 $lang['Lock'] = 'Lezárás';
 $lang['Locked'] = 'Lezárt';
-$lang['manage category elements'] = 'Kategória elemeinek kezelése';
-$lang['manage sub-categories'] = 'Alkategóriák kezelése';
+$lang['manage album elements'] = 'Kategória elemeinek kezelése';
+$lang['manage sub-albums'] = 'Alkategóriák kezelése';
 $lang['Manage'] = 'Kezelés';
 $lang['maximum height'] = 'Maximális magasság';
 $lang['maximum width'] = 'Maximális szélesség';
@@ -387,7 +386,7 @@ $lang['for this file format'] = 'formátum';
 $lang['unit mode'] = 'Képenként';
 $lang['Unlocked'] = 'Zárolatlan';
 $lang['unset'] = 'Eltávolítás';
-$lang['Update categories informations'] = 'Kategóriák információinak frissítése';
+$lang['Update albums informations'] = 'Kategóriák információinak frissítése';
 $lang['Update images informations'] = 'Képek információinak frissítése';
 $lang['Synchronize'] = 'Szinkronizálás';
 $lang['reduce to single existing categories'] = 'Szűkítés egy már meglévő kategóriára';
@@ -632,7 +631,7 @@ $lang['Create the "%s" directory at the root of your Piwigo installation'] = '"%
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Adjon írási jogot (chmod 777) a(z) "%s" gyökerének a telepített Piwigo galériában';
 $lang['existing category'] = 'létező kategória';
 $lang['create a new category'] = 'új kategória létrehozása';
-$lang['Category name'] = 'Kategória neve';
+$lang['Album name'] = 'Kategória neve';
 $lang['Category "%s" has been added'] = '"%s" kategória hozzáadva';
 $lang['Uploaded Photos'] = 'Feltöltött képek';
 $lang['%d photos uploaded'] = '%d kép feltöltve';
diff --git a/language/it_IT/admin.lang.php b/language/it_IT/admin.lang.php
index d221ce99a..fd926d25d 100644
--- a/language/it_IT/admin.lang.php
+++ b/language/it_IT/admin.lang.php
@@ -67,7 +67,7 @@ $lang['Caddie management'] = 'Gestione del cestino';
 $lang['Caddie'] = 'Cestino';
 $lang['Categories authorized thanks to group associations'] = 'Categorie accessibili grazie all\'appartenenza ai gruppi';
 $lang['Album manual order was saved'] = 'L\'ordinamento manuale delle categorie è stato salvato';
-$lang['Category elements associated to the following categories: %s'] = 'Gli elementi della categoria sono stati associati alle categorie seguenti : %s';
+$lang['Album elements associated to the following albums: %s'] = 'Gli elementi della categoria sono stati associati alle categorie seguenti : %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'La verifica dell\'ultima versione sul server è fallita per le ragioni sconosciute.';
 $lang['Check for upgrade'] = 'Controllo aggiornamenti';
 $lang['Comments for all'] = 'Commenti per tutti';
@@ -105,12 +105,12 @@ $lang['Guests'] = 'Ospiti';
 $lang['History'] = 'Cronologia';
 $lang['Informations'] = 'Informazioni';
 $lang['Install'] = 'Installare';
-$lang['Link all category elements to a new category'] = 'Associare tutti gli elementi della categoria ad una nuova categoria';
-$lang['Link all category elements to some existing categories'] = 'Associare tutti gli elementi della categoria a delle categorie esistenti';
+$lang['Link all album elements to a new album'] = 'Associare tutti gli elementi della categoria ad una nuova categoria';
+$lang['Link all album elements to some existing albums'] = 'Associare tutti gli elementi della categoria a delle categorie esistenti';
 $lang['Linked albums'] = 'Categorie associate';
 $lang['Lock gallery'] = 'Blocco della galleria';
 $lang['Maintenance'] = 'Manutenzione';
-$lang['Manage permissions for a category'] = 'Gestire i permessi per una categoria';
+$lang['Edit album permissions'] = 'Gestire i permessi per una categoria';
 $lang['Manage permissions for group "%s"'] = 'Gestire i permessi per il gruppo "%s"';
 $lang['Manage permissions for user "%s"'] = 'Gestire i permessi per l\'utente "%s"';
 $lang['Manage tags'] = 'Gestire i tags';
@@ -158,7 +158,7 @@ $lang['Representative'] = 'Rappresentativa';
 $lang['Represents'] = 'Rappresenta';
 $lang['Save order'] = 'Salvare l\'ordine';
 $lang['Save to permalink history'] = 'Salvare nella cronologia dei permalinks';
-$lang['Select at least one category'] = 'Scegliere almeno una categoria';
+$lang['Select at least one album'] = 'Scegliere almeno una categoria';
 $lang['Select at least one picture'] = 'Scegliere almeno un\'immagine';
 $lang['Select at least one user'] = 'Scegliere almeno un\'utente';
 $lang['Show info'] = 'Mostra le informazioni';
@@ -181,22 +181,21 @@ $lang['Validate All'] = 'Approvare tutto';
 $lang['Validate'] = 'Approvare';
 $lang['Validation'] = 'Richiedere l\'approvazione';
 $lang['Version'] = 'Versione';
-$lang['Virtual categories movement'] = 'Spostamenti categoria virtuale';
-$lang['Virtual categories to move'] = 'Categorie virtuali da spostare';
+$lang['Virtual albums to move'] = 'Categorie virtuali da spostare';
 $lang['Virtual album name'] = 'Nome della categoria virtuale';
 $lang['Webmaster cannot be deleted'] = 'Il Webmaster non può essere cancellato';
 $lang['You are running on development sources, no check possible.'] = 'State lavorando con una versione di sviluppo, impossibile verificare l\'ultima versione.';
 $lang['You cannot delete your account'] = 'Non potete cancellare il vostro account utente';
-$lang['You cannot move a category in its own sub category'] = 'Non potete spostare una categoria in una sua sottocategoria.';
+$lang['You cannot move a album in its own sub album'] = 'Non potete spostare una categoria in una sua sottocategoria.';
 $lang['You need to confirm deletion'] = 'Dovete confermare la cancellazione';
 $lang['add tags'] = 'Aggiungere i tags';
 $lang['Adviser'] = 'Consigliere';
-$lang['associate to category'] = 'Associare alla categoria';
+$lang['Associate to album'] = 'Associare alla categoria';
 $lang['associate to group'] = 'Associare al gruppo';
 $lang['Authorized'] = 'Autorizzate';
 $lang['Add a virtual album'] = 'Aggiungere una categoria virtuale';
 $lang['Authorize users to add comments on selected categories'] = 'Autorizzare gli utenti ad aggiungere commenti nelle categorie selezionate';
-$lang['The name of a category should not be empty'] = 'Il nome della categoria non deve essere vuoto';
+$lang['The name of an album must not be empty'] = 'Il nome della categoria non deve essere vuoto';
 $lang['Lock albums'] = 'Blocco delle categorie';
 $lang['Private'] = 'Categoria privata';
 $lang['Public'] = 'Categoria pubblica';
@@ -217,11 +216,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = 'Il
 $lang['Configuration'] = 'Configurazione';
 $lang['confirm'] = 'Confermare';
 $lang['Date'] = 'Data';
-$lang['delete category'] = 'Cancellare la categoria';
-$lang['dissociate from category'] = 'Dissociare dalla categoria';
+$lang['delete album'] = 'Cancellare la categoria';
+$lang['Dissociate from album'] = 'Dissociare dalla categoria';
 $lang['dissociate from group'] = 'Dissociare dal gruppo';
-$lang['edit category permissions'] = 'Modificare i permessi della categoria';
-$lang['Category informations updated successfully.'] = 'Le informazioni della categoria sono state aggiornate con successo.';
+$lang['edit album permissions'] = 'Modificare i permessi della categoria';
+$lang['Album updated successfully'] = 'Le informazioni della categoria sono state aggiornate con successo.';
 $lang['Authorize upload'] = 'Autorizzare l\'aggiunta d\'immagini';
 $lang['elements per page'] = 'Numero di elementi da visualizzare per pagina';
 $lang['elements'] = 'Elementi';
@@ -239,13 +238,13 @@ $lang['The name of a group must not contain " or \' or be empty.'] = 'Il nome de
 $lang['This name is already used by another group.'] = 'Questo nome è già  usato per un altro gruppo.';
 $lang[''] = "";
 $lang['High definition'] = 'Alta definizione';
-$lang['jump to category'] = 'Andare alla categoria';
+$lang['jump to album'] = 'Andare alla categoria';
 $lang['jump to image'] = 'Andare al\'immagine';
 $lang['leave'] = 'Abbandonare';
 $lang['Lock'] = 'Bloccare';
 $lang['Locked'] = 'Bloccate';
-$lang['manage category elements'] = 'Gestire gli elementi della categoria';
-$lang['manage sub-categories'] = 'Gestire le sottocategorie';
+$lang['manage album elements'] = 'Gestire gli elementi della categoria';
+$lang['manage sub-albums'] = 'Gestire le sottocategorie';
 $lang['Manage'] = 'Gestire';
 $lang['maximum height'] = 'Altezza massima';
 $lang['maximum width'] = 'Larghezza massima';
@@ -393,7 +392,7 @@ $lang['for this file format'] = 'per questo formato di file';
 $lang['unit mode'] = 'Modalità singolo';
 $lang['Unlocked'] = 'Sbloccate';
 $lang['unset'] = 'Svuotare';
-$lang['Update categories informations'] = 'Aggiorna le informazioni delle categorie';
+$lang['Update albums informations'] = 'Aggiorna le informazioni delle categorie';
 $lang['Update images informations'] = 'Aggiorna le informazioni delle immagini';
 $lang['Synchronize'] = 'Sincronizzare';
 $lang['reduce to single existing categories'] = 'Eseguire unicamente sulle categorie selezionate';
@@ -647,7 +646,7 @@ $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Cr
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Dare i permessi in scrittura (chmod 777) alla directory "% s" nella radice della vostra installazione Piwigo';
 $lang['existing category'] = 'categoria esistente';
 $lang['create a new category'] = 'creare una nuova categoria';
-$lang['Category name'] = 'Nome della categoria';
+$lang['Album name'] = 'Nome della categoria';
 $lang['Category "%s" has been added'] = 'La categoria "%s" è stata aggiunta';
 $lang['Uploaded Photos'] = 'Foto aggiunte ';
 $lang['%d photos uploaded'] = '%d foto aggiunte';
diff --git a/language/ja_JP/admin.lang.php b/language/ja_JP/admin.lang.php
index 0606bdf6e..60d7c6727 100644
--- a/language/ja_JP/admin.lang.php
+++ b/language/ja_JP/admin.lang.php
@@ -65,7 +65,7 @@ $lang['Caddie management'] = 'キャディ管理';
 $lang['Caddie'] = 'キャディ';
 $lang['Categories authorized thanks to group associations'] = 'グループの関連付けによりカテゴリが許可されました。';
 $lang['Album manual order was saved'] = 'カテゴリの手動順が保存されました。';
-$lang['Category elements associated to the following categories: %s'] = '以下のカテゴリに関連するカテゴリエレメント: %s';
+$lang['Album elements associated to the following albums: %s'] = '以下のカテゴリに関連するカテゴリエレメント: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = '不明な理由により、アップグレードのチェックが失敗しました。';
 $lang['Check for upgrade'] = 'アップグレードをチェックする';
 $lang['Comments for all'] = 'すべてのユーザにコメントを許可する';
@@ -103,12 +103,12 @@ $lang['Guests'] = 'ゲスト';
 $lang['History'] = '履歴';
 $lang['Informations'] = '情報';
 $lang['Install'] = 'インストール';
-$lang['Link all category elements to a new category'] = 'すべてのカテゴリエレメントを新しいカテゴリにリンクする';
-$lang['Link all category elements to some existing categories'] = 'すべてのカテゴリエレメントを既存のカテゴリにリンクする';
+$lang['Link all album elements to a new album'] = 'すべてのカテゴリエレメントを新しいカテゴリにリンクする';
+$lang['Link all album elements to some existing albums'] = 'すべてのカテゴリエレメントを既存のカテゴリにリンクする';
 $lang['Linked albums'] = 'リンクカテゴリ';
 $lang['Lock gallery'] = 'ギャラリーをロックする';
 $lang['Maintenance'] = 'メンテナンス';
-$lang['Manage permissions for a category'] = 'カテゴリのパーミッションを管理する';
+$lang['Edit album permissions'] = 'カテゴリのパーミッションを管理する';
 $lang['Manage permissions for group "%s"'] = 'グループ「 %s 」のパーミッションを管理する';
 $lang['Manage permissions for user "%s"'] = 'ユーザ「 %s 」のパーミッションを管理する';
 $lang['Manage tags'] = 'タグを管理する';
@@ -156,7 +156,7 @@ $lang['Representative'] = '見本';
 $lang['Represents'] = '表示';
 $lang['Save order'] = '表示順を保存する';
 $lang['Save to permalink history'] = 'パーマネントリンク履歴に保存する';
-$lang['Select at least one category'] = '少なくとも1つのカテゴリを選択してください。';
+$lang['Select at least one album'] = '少なくとも1つのカテゴリを選択してください。';
 $lang['Select at least one picture'] = '少なくとも1つの写真を選択してください。';
 $lang['Select at least one user'] = '少なくとも1名のユーザを選択してください。';
 $lang['Show info'] = '情報を表示する';
@@ -178,22 +178,21 @@ $lang['Validate All'] = 'すべてを承認する';
 $lang['Validate'] = '承認';
 $lang['Validation'] = '承認';
 $lang['Version'] = 'バージョン';
-$lang['Virtual categories movement'] = 'バーチャルカテゴリの移動';
-$lang['Virtual categories to move'] = '移動するバーチャルカテゴリ';
+$lang['Virtual albums to move'] = '移動するバーチャルカテゴリ';
 $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'] = "あなた自身のアカウントを削除できません。";
-$lang['You cannot move a category in its own sub category'] = 'あなたは、カテゴリをサブカテゴリに移動できません。';
+$lang['You cannot move a album in its own sub album'] = 'あなたは、カテゴリをサブカテゴリに移動できません。';
 $lang['You need to confirm deletion'] = 'あなたは、削除を確認する必要があります。';
 $lang['add tags'] = 'タグを追加する';
 $lang['Adviser'] = 'アドバイザ';
-$lang['associate to category'] = 'カテゴリに関連付ける';
+$lang['Associate to album'] = 'カテゴリに関連付ける';
 $lang['associate to group'] = 'グループに関連付ける';
 $lang['Authorized'] = '承認';
 $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['The name of an album must not be empty'] = 'カテゴリ名は空白にしないでください。';
 $lang['Lock albums'] = 'カテゴリをロックする';
 $lang['Private'] = 'プライベートカテゴリ';
 $lang['Public'] = 'パブリックカテゴリ';
@@ -214,11 +213,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = '1�
 $lang['Configuration'] = '設定';
 $lang['confirm'] = '確認';
 $lang['Date'] = '日付';
-$lang['delete category'] = 'カテゴリを削除する';
-$lang['dissociate from category'] = 'カテゴリから関連付けを解除する';
+$lang['delete album'] = 'カテゴリを削除する';
+$lang['Dissociate from album'] = 'カテゴリから関連付けを解除する';
 $lang['dissociate from group'] = 'グループから関連付けを解除する';
-$lang['edit category permissions'] = 'カテゴリパーミッションを編集する';
-$lang['Category informations updated successfully.'] = 'カテゴリ情報が正常に更新されました。';
+$lang['edit album permissions'] = 'カテゴリパーミッションを編集する';
+$lang['Album updated successfully'] = 'カテゴリ情報が正常に更新されました。';
 $lang['Authorize upload'] = 'アップロードを許可する';
 $lang['elements per page'] = '1ページあたりのエレメント';
 $lang['elements'] = 'エレメント';
@@ -236,13 +235,13 @@ $lang['The name of a group must not contain " or \' or be empty.'] = 'グルー�
 $lang['This name is already used by another group.'] = 'このグループ名は、すでに別のグループで使用されています。';
 $lang[''] = '';
 $lang['High definition'] = '高解像度';
-$lang['jump to category'] = 'カテゴリにジャンプする';
+$lang['jump to album'] = 'カテゴリにジャンプする';
 $lang['jump to image'] = 'イメージにジャンプする';
 $lang['leave'] = '変更なし';
 $lang['Lock'] = 'ロック';
 $lang['Locked'] = 'ロック済み';
-$lang['manage category elements'] = 'カテゴリエレメントを管理する';
-$lang['manage sub-categories'] = 'サブカテゴリを管理する';
+$lang['manage album elements'] = 'カテゴリエレメントを管理する';
+$lang['manage sub-albums'] = 'サブカテゴリを管理する';
 $lang['Manage'] = '管理';
 $lang['maximum height'] = '最大高';
 $lang['maximum width'] = '最大幅';
@@ -388,7 +387,7 @@ $lang['for this file format'] = 'このファイルフォーマット';
 $lang['unit mode'] = 'ユニットモード';
 $lang['Unlocked'] = '未ロック';
 $lang['unset'] = '設定解除';
-$lang['Update categories informations'] = 'カテゴリ情報を更新する';
+$lang['Update albums informations'] = 'カテゴリ情報を更新する';
 $lang['Update images informations'] = 'イメージ情報を更新する';
 $lang['Synchronize'] = '同期化';
 $lang['reduce to single existing categories'] = '既存の単一カテゴリに減らす';
@@ -646,7 +645,7 @@ $lang['Create the "%s" directory at the root of your Piwigo installation'] = ' P
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Piwigoにインストールされている場所の "%s" というディレクトリーに書き込み(chmod 777)アクセスをする。';
 $lang['existing category'] = '存在しているカテゴリー';
 $lang['create a new category'] = '新しいカテゴリーを作成する';
-$lang['Category name'] = 'カテゴリー名';
+$lang['Album name'] = 'カテゴリー名';
 $lang['Category "%s" has been added'] = '"%s"のカテゴリーは追加された';
 $lang['Uploaded Photos'] = 'アップロードされた写真';
 $lang['%d photos uploaded'] = '%d 枚の写真がアップロードされた';
diff --git a/language/ka_GE/admin.lang.php b/language/ka_GE/admin.lang.php
index 249139979..b34203b76 100644
--- a/language/ka_GE/admin.lang.php
+++ b/language/ka_GE/admin.lang.php
@@ -65,7 +65,7 @@ $lang['Caddie management'] = 'კალათის მართვა';
 $lang['Caddie'] = 'კალათა';
 $lang['Categories authorized thanks to group associations'] = 'კატეგორიები, რომლებიც დაშვებულია ჯგუფთან კავშირის გამო';
 $lang['Album manual order was saved'] = 'კატეგორიების განსაკუთრებული წყობა შენახულია';
-$lang['Category elements associated to the following categories: %s'] = 'ფოტოების კატეგორიები დაკავშირებულია შემდეგ კატეგორიებთან: %s';
+$lang['Album elements associated to the following albums: %s'] = 'ფოტოების კატეგორიები დაკავშირებულია შემდეგ კატეგორიებთან: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'განახლების შემოწმება უცნობი მიზეზების გამო არ შესრულდა.';
 $lang['Check for upgrade'] = 'განახლების შემოწმება';
 $lang['Comments for all'] = 'კომენტარები ყველასათვის';
@@ -104,12 +104,12 @@ $lang['Guests'] = 'სტუმრები';
 $lang['History'] = 'ისტორია';
 $lang['Informations'] = 'ინფორმაცია';
 $lang['Install'] = 'დავაყენოთ';
-$lang['Link all category elements to a new category'] = 'დაუკავშიროთ ამ კატეგორიის ყველა ელემენტი ახალს';
-$lang['Link all category elements to some existing categories'] = 'დაუკავშიროთ ამ კატეგორიის ყველა ელემენტი ერთ ერთ არსებულს';
+$lang['Link all album elements to a new album'] = 'დაუკავშიროთ ამ კატეგორიის ყველა ელემენტი ახალს';
+$lang['Link all album elements to some existing albums'] = 'დაუკავშიროთ ამ კატეგორიის ყველა ელემენტი ერთ ერთ არსებულს';
 $lang['Linked albums'] = 'დაკავშირებული კატეგორიები';
 $lang['Lock gallery'] = 'დავბლოკოთ გალერეა';
 $lang['Maintenance'] = 'მომსახურება';
-$lang['Manage permissions for a category'] = 'ნებართვების მართვა კატეგორიებისათვის';
+$lang['Edit album permissions'] = 'ნებართვების მართვა კატეგორიებისათვის';
 $lang['Manage permissions for group "%s"'] = 'ნებართვების მართვა ჯგუფისთვის  "%s"';
 $lang['Manage permissions for user "%s"'] = 'ნებართვების მართვა მომხმარებლებისათვის  "%s"';
 $lang['Manage tags'] = 'სიტყვების მართვა';
@@ -157,7 +157,7 @@ $lang['Representative'] = 'წარმომადგენელი';
 $lang['Represents'] = 'წარმოადგენს';
 $lang['Save order'] = 'შევინახოთ წყობა';
 $lang['Save to permalink history'] = 'შევინახოთ მუდმვი მისამართების ისტორია';
-$lang['Select at least one category'] = 'აირჩიეთ ერთი კატეგორია მაინც';
+$lang['Select at least one album'] = 'აირჩიეთ ერთი კატეგორია მაინც';
 $lang['Select at least one picture'] = 'აირჩიეთ ერთი ფოტო მაინც';
 $lang['Select at least one user'] = 'აირჩიეთ ერთი მომხმარებელი მაინც';
 $lang['Show info'] = 'ვნახოთ ინფორმაცია';
@@ -179,22 +179,21 @@ $lang['Validate All'] = 'მივიღოთ ყველა';
 $lang['Validate'] = 'მივიღოთ';
 $lang['Validation'] = 'შემოწმება';
 $lang['Version'] = 'ვერსია';
-$lang['Virtual categories movement'] = 'ვირტუალური კატეგორიების გადატანა';
-$lang['Virtual categories to move'] = 'ვირტუალური კატეგორიები გადასატანად';
+$lang['Virtual albums to move'] = 'ვირტუალური კატეგორიები გადასატანად';
 $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'] = "თქვენ არ შეგიძლიათ თქვენი აკკაუნთის წაშლა";
-$lang['You cannot move a category in its own sub category'] = 'თქვენ არ შეგიძლიათ გადააადგილოთ კატეგორია მის ქვეკატერორიაში';
+$lang['You cannot move a album in its own sub album'] = 'თქვენ არ შეგიძლიათ გადააადგილოთ კატეგორია მის ქვეკატერორიაში';
 $lang['You need to confirm deletion'] = 'თქვენ უნდა დაადასტუროთ წაშლა';
 $lang['add tags'] = 'დავამატოთ სიტყვები';
 $lang['Adviser'] = 'დამხმარე';
-$lang['associate to category'] = 'მივამაგროთ კატეგორიას';
+$lang['Associate to album'] = 'მივამაგროთ კატეგორიას';
 $lang['associate to group'] = 'მივამაგროთ ჯგუფს';
 $lang['Authorized'] = 'დასაშვებია';
 $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['The name of an album must not be empty'] = 'კატეგორიის სახელი ცარიელი არ უნდა იყოს';
 $lang['Lock albums'] = 'დავბლოკოთ კატეგორიები';
 $lang['Private'] = 'პირადი(პრივატული) კატეგორია';
 $lang['Public'] = 'საერთო კატეგორია';
@@ -215,11 +214,11 @@ $lang['Main'] = 'მთავარი';
 $lang['The number of comments a page must be between 5 and 50 included.'] = 'გვერდზე შეიძლება იყოს 5 დან 50 კომენტარამდე.';
 $lang['Configuration'] = 'გასწორება';
 $lang['confirm'] = 'დასტური';
-$lang['delete category'] = 'წავშალოთ კატეგორია';
-$lang['dissociate from category'] = 'მოვაშოროთ კატეგორიას';
+$lang['delete album'] = 'წავშალოთ კატეგორია';
+$lang['Dissociate from album'] = 'მოვაშოროთ კატეგორიას';
 $lang['dissociate from group'] = 'მოვაშოროთ ჯგუფს';
-$lang['edit category permissions'] = 'კატეგორიის უფლებების რედაქტირება';
-$lang['Category informations updated successfully.'] = 'ინფორმაცია კატეგორიაზე წარმატებით განახლებულია.';
+$lang['edit album permissions'] = 'კატეგორიის უფლებების რედაქტირება';
+$lang['Album updated successfully'] = 'ინფორმაცია კატეგორიაზე წარმატებით განახლებულია.';
 $lang['Authorize upload'] = 'დაუშვათ გადმოწერა';
 $lang['elements per page'] = 'მინიატურები გვერდზე';
 $lang['elements'] = 'ელემენტები';
@@ -237,13 +236,13 @@ $lang['The name of a group must not contain " or \' or be empty.'] = 'ჯგუ�
 $lang['This name is already used by another group.'] = 'ეს სახელი უკვე გამოყენებულია სხვა ჯგუფის მიერ.';
 $lang['Groups'] = 'ჯგუფები';
 $lang['High definition'] = 'დიდი გაფართოება';
-$lang['jump to category'] = 'კატეგორიაში გადასვლა';
+$lang['jump to album'] = 'კატეგორიაში გადასვლა';
 $lang['jump to image'] = 'ფოტოებში გადასვლა';
 $lang['leave'] = 'დავტოვოთ';
 $lang['Lock'] = 'ბლოკირება';
 $lang['Locked'] = 'დაბლოკილია';
-$lang['manage category elements'] = 'კატეგორიის ფოტოების მართვა';
-$lang['manage sub-categories'] = 'ქვეკატეგორიების მართვა';
+$lang['manage album elements'] = 'კატეგორიის ფოტოების მართვა';
+$lang['manage sub-albums'] = 'ქვეკატეგორიების მართვა';
 $lang['Manage'] = 'მართვა';
 $lang['maximum height'] = 'მაქსიმალური სიმაღლე';
 $lang['maximum width'] = 'მაქსიმალური სიგანე';
@@ -392,7 +391,7 @@ $lang['for this file format'] = 'ამ ფაილის ფორმატი
 $lang['unit mode'] = 'ერთეული რეჟიმი';
 $lang['Unlocked'] = 'ბლოკის მოხსნა';
 $lang['unset'] = 'გავასუფთაოთ';
-$lang['Update categories informations'] = 'განვაახლოთ ინფორმაცია კატეგორიებზე';
+$lang['Update albums informations'] = 'განვაახლოთ ინფორმაცია კატეგორიებზე';
 $lang['Update images informations'] = 'განვაახლოთ ინფორმაცია ფოტოებზე';
 $lang['Synchronize'] = 'სინქრონიზაცია';
 $lang['reduce to single existing categories'] = 'შევამოწმოთ მხოლოდ კატეგორია';
@@ -656,7 +655,7 @@ $lang['Create the "%s" directory at the root of your Piwigo installation'] = '�
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'მიეცით ჩაწერაზე დაშვება (chmod 777)  "%s" კატალოგს, თქვენს მიერ დაყენებული Piwigo-ს ფუძეში';
 $lang['existing category'] = 'არსებული კატეგორია';
 $lang['create a new category'] = 'შევქმნათ ახალი კატეგორია';
-$lang['Category name'] = 'კატეგორიის სახელი';
+$lang['Album name'] = 'კატეგორიის სახელი';
 $lang['Category "%s" has been added'] = 'კატეგორია "%s" დამატებულია';
 $lang['Uploaded Photos'] = 'ატვირთული ფოტოები';
 $lang['%d photos uploaded'] = '%d ფოტოები ატვირთულია';
diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php
index 442fa26b6..d3b89aaee 100644
--- a/language/nl_NL/admin.lang.php
+++ b/language/nl_NL/admin.lang.php
@@ -65,7 +65,7 @@ $lang['Caddie management'] = 'Winkelmandje management';
 $lang['Caddie'] = 'Winkelmandje';
 $lang['Categories authorized thanks to group associations'] = 'Categorieën geautoriseerd dankzij groepassociaties';
 $lang['Album manual order was saved'] = 'Categorieën handmatig gesorteerd is opgeslagen';
-$lang['Category elements associated to the following categories: %s'] = 'Categorie afbeeldingen gelinkt aan de volgende categorieën: %s';
+$lang['Album elements associated to the following albums: %s'] = 'Categorie afbeeldingen gelinkt aan de volgende categorieën: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'Upgradecontrole is door onbekende reden niet (goed) uitgevoerd.';
 $lang['Check for upgrade'] = 'Upgradecontrole';
 $lang['Comments for all'] = 'Iedereen mag commentaar geven (ook gasten)';
@@ -103,12 +103,12 @@ $lang['Guests'] = 'Gasten';
 $lang['History'] = 'Geschiedenis';
 $lang['Informations'] = 'Informatie';
 $lang['Install'] = 'Installeer';
-$lang['Link all category elements to a new category'] = 'Link alle categorie-afbeeldingen aan een nieuwe categorie';
-$lang['Link all category elements to some existing categories'] = 'Link alle categorie-afbeeldingen aan bestaande categorieën';
+$lang['Link all album elements to a new album'] = 'Link alle categorie-afbeeldingen aan een nieuwe categorie';
+$lang['Link all album elements to some existing albums'] = 'Link alle categorie-afbeeldingen aan bestaande categorieën';
 $lang['Linked albums'] = 'Gelinkte categorieën';
 $lang['Lock gallery'] = 'Sluit galerie voor onderhoud';
 $lang['Maintenance'] = 'Onderhoud';
-$lang['Manage permissions for a category'] = 'Beheer rechten van een categorie';
+$lang['Edit album permissions'] = 'Beheer rechten van een categorie';
 $lang['Manage permissions for group "%s"'] = 'Beheer rechten van groep "%s"';
 $lang['Manage permissions for user "%s"'] = 'Beheer rechten van gebruiker "%s"';
 $lang['Manage tags'] = 'Beheer tags';
@@ -156,7 +156,7 @@ $lang['Representative'] = 'Representatief';
 $lang['Represents'] = 'Representeerd';
 $lang['Save order'] = 'Bewaar sortering';
 $lang['Save to permalink history'] = 'Opslaan in permalink geschiedenis';
-$lang['Select at least one category'] = 'Selecteer minstens één categorie';
+$lang['Select at least one album'] = 'Selecteer minstens één categorie';
 $lang['Select at least one picture'] = 'Selecteer minstens één plaatje';
 $lang['Select at least one user'] = 'Selecteer minstens één gebruiker';
 $lang['Show info'] = 'Toon info';
@@ -179,22 +179,21 @@ $lang['Validate All'] = 'Valideer alles';
 $lang['Validate'] = 'Valideren';
 $lang['Validation'] = 'Validatie van commentaar voor plaatsing is nodig';
 $lang['Version'] = 'Versie';
-$lang['Virtual categories movement'] = 'Virtuele categorie-verplaatsing';
-$lang['Virtual categories to move'] = 'Virtuele categorieën om te verplaatsen';
+$lang['Virtual albums to move'] = 'Virtuele categorieën om te verplaatsen';
 $lang['Virtual album name'] = 'Virtuele categorienaam';
 $lang['Webmaster cannot be deleted'] = 'Webbeheerder kan niet verwijderd worden';
 $lang['You are running on development sources, no check possible.'] = 'U werkt op basis van ontwikkelings bronnen, geen controle mogelijk.';
 $lang['You cannot delete your account'] = "U kunt uw account niet verwijderen";
-$lang['You cannot move a category in its own sub category'] = 'U kunt een categorie niet verplaatsen naar zijn eigen sub-categorie';
+$lang['You cannot move a album in its own sub album'] = 'U kunt een categorie niet verplaatsen naar zijn eigen sub-categorie';
 $lang['You need to confirm deletion'] = 'U moet de verwijdering bevestigen';
 $lang['add tags'] = 'Toevoegen tags';
 $lang['Adviser'] = 'Adviseur';
-$lang['associate to category'] = 'Link aan categorie';
+$lang['Associate to album'] = 'Link aan categorie';
 $lang['associate to group'] = 'Link aan groep';
 $lang['Authorized'] = 'Toegestaan';
 $lang['Add a virtual album'] = 'Voeg een virtuele categorie toe';
 $lang['Authorize users to add comments on selected categories'] = 'Selecteer categorieën waarop commentaar gegeven mag worden';
-$lang['The name of a category should not be empty'] = 'De naam van een categorie mag niet leeg zijn';
+$lang['The name of an album must not be empty'] = 'De naam van een categorie mag niet leeg zijn';
 $lang['Lock albums'] = 'Beschikbaarheid van geselecteerde categorieën';
 $lang['Private'] = 'Privé categorie';
 $lang['Public'] = 'Openbare categorie';
@@ -215,11 +214,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = 'Het
 $lang['Configuration'] = 'Configuratie';
 $lang['confirm'] = 'Bevestig';
 $lang['Date'] = 'Datum';
-$lang['delete category'] = 'verwijder categorie';
-$lang['dissociate from category'] = 'Verwijder link aan categorie';
+$lang['delete album'] = 'verwijder categorie';
+$lang['Dissociate from album'] = 'Verwijder link aan categorie';
 $lang['dissociate from group'] = 'Verwijder link aan groep';
-$lang['edit category permissions'] = 'bewerk categorie rechten';
-$lang['Category informations updated successfully.'] = 'Categorie informatie is met succes bijgewerkt.';
+$lang['edit album permissions'] = 'bewerk categorie rechten';
+$lang['Album updated successfully'] = 'Categorie informatie is met succes bijgewerkt.';
 $lang['Authorize upload'] = 'Toestaan van uploads';
 $lang['elements per page'] = 'Afbeeldingen per pagina';
 $lang['elements'] = 'Afbeeldingen';
@@ -237,13 +236,13 @@ $lang['The name of a group must not contain " or \' or be empty.'] = 'De naam va
 $lang['This name is already used by another group.'] = 'Deze naam is al in gebruik door een andere groep.';
 $lang[''] = '';
 $lang['High definition'] = 'Hoge kwaliteit';
-$lang['jump to category'] = 'Ga naar categorie';
+$lang['jump to album'] = 'Ga naar categorie';
 $lang['jump to image'] = 'Ga naar afbeelding';
 $lang['leave'] = 'Niet wijzigen';
 $lang['Lock'] = 'Gesloten';
 $lang['Locked'] = 'Gesloten categorie';
-$lang['manage category elements'] = 'Beheer categorie-afbeeldingen';
-$lang['manage sub-categories'] = 'Beheer sub-categorie';
+$lang['manage album elements'] = 'Beheer categorie-afbeeldingen';
+$lang['manage sub-albums'] = 'Beheer sub-categorie';
 $lang['Manage'] = 'Beheer';
 $lang['maximum height'] = 'maximale hoogte';
 $lang['maximum width'] = 'maximale breedte';
@@ -388,7 +387,7 @@ $lang['for this file format'] = 'voor dit bestandsformaat';
 $lang['unit mode'] = 'Uitgebreid overzicht';
 $lang['Unlocked'] = 'Open categorie';
 $lang['unset'] = 'Niet ingesteld';
-$lang['Update categories informations'] = 'Categorie-informatie bijwerken';
+$lang['Update albums informations'] = 'Categorie-informatie bijwerken';
 $lang['Update images informations'] = 'Afbeeldings-informatie bijwerken';
 $lang['Synchronize'] = 'Synchroniseer';
 $lang['reduce to single existing categories'] = 'Alleen naar de bestaande categorieën terugbrengen';
@@ -643,7 +642,7 @@ $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Ma
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Geef schrijfrechten (chmod 777) aan de "%s" directory vanuit de root van uw piwigo installatie';
 $lang['existing category'] = 'Bestaande categorie';
 $lang['create a new category'] = 'Maak een nieuwe categorie aan';
-$lang['Category name'] = 'Categorienaam';
+$lang['Album name'] = 'Categorienaam';
 $lang['Category "%s" has been added'] = 'Categorie "%s" is toegevoegd';
 $lang['Uploaded Photos'] = 'Ge-uploade Foto\'s';
 $lang['%d photos uploaded'] = '%d foto\'s ge-uploaded';
diff --git a/language/pl_PL/admin.lang.php b/language/pl_PL/admin.lang.php
index 64e3ff5b5..6ba392096 100644
--- a/language/pl_PL/admin.lang.php
+++ b/language/pl_PL/admin.lang.php
@@ -65,7 +65,7 @@ $lang['Caddie management'] = 'Zarządzanie koszykiem';
 $lang['Caddie'] = 'Koszyk';
 $lang['Categories authorized thanks to group associations'] = 'Kategorie zautoryzowane dzięki powiązaniu z grupami';
 $lang['Album manual order was saved'] = 'Zapisano ręcznie wykonaną kolejność kategorii';
-$lang['Category elements associated to the following categories: %s'] = 'Elementy kategorii powiązane z następującymi kategoriami: %s';
+$lang['Album elements associated to the following albums: %s'] = 'Elementy kategorii powiązane z następującymi kategoriami: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'Sprawdzenie aktualizacji nie powiodło się z nieznanych powodów.';
 $lang['Check for upgrade'] = 'Sprawdź aktualizacje';
 $lang['Comments for all'] = 'Komentarze dla wszystkich';
@@ -103,12 +103,12 @@ $lang['Guests'] = 'Goście';
 $lang['History'] = 'Historia';
 $lang['Informations'] = 'Informacje';
 $lang['Install'] = 'Instaluj';
-$lang['Link all category elements to a new category'] = 'Podepnij wszystkie elementy kategorii do nowej kategorii';
-$lang['Link all category elements to some existing categories'] = 'Podepnij wszystkie elementy kategorii do istniejącej kategorii';
+$lang['Link all album elements to a new album'] = 'Podepnij wszystkie elementy kategorii do nowej kategorii';
+$lang['Link all album elements to some existing albums'] = 'Podepnij wszystkie elementy kategorii do istniejącej kategorii';
 $lang['Linked albums'] = 'Podpięte kategorie';
 $lang['Lock gallery'] = 'Zablokuj galerię';
 $lang['Maintenance'] = 'Przerwa techniczna';
-$lang['Manage permissions for a category'] = 'Zarządzaj uprawnieniami dla kategorii';
+$lang['Edit album permissions'] = 'Zarządzaj uprawnieniami dla kategorii';
 $lang['Manage permissions for group "%s"'] = 'Zarządzaj uprawnieniami dla grupy "%s"';
 $lang['Manage permissions for user "%s"'] = 'Zarządzaj uprawnieniami dla użytkownika "%s"';
 $lang['Manage tags'] = 'Zarządzaj tagami';
@@ -156,7 +156,7 @@ $lang['Representative'] = 'Representacyjny';
 $lang['Represents'] = 'Representuje';
 $lang['Save order'] = 'Zapisz kolejność';
 $lang['Save to permalink history'] = 'Zapisz do historii linków permanentnych';
-$lang['Select at least one category'] = 'Wybierz przynajmniej jedną kategorię';
+$lang['Select at least one album'] = 'Wybierz przynajmniej jedną kategorię';
 $lang['Select at least one picture'] = 'Wybierz przynajmniej jeden obraz';
 $lang['Select at least one user'] = 'Wybierz przynajmniej jednego użytkownika';
 $lang['Show info'] = 'Pokaż informacje';
@@ -178,22 +178,21 @@ $lang['Validate All'] = 'Zatwierdź wszystkie';
 $lang['Validate'] = 'Zatwierdź';
 $lang['Validation'] = 'Zatwierdzanie';
 $lang['Version'] = 'Wersja';
-$lang['Virtual categories movement'] = 'Przenoszenie kategorii wirtualnych';
-$lang['Virtual categories to move'] = 'Kategorie wirtualne do przeniesienia';
+$lang['Virtual albums to move'] = 'Kategorie wirtualne do przeniesienia';
 $lang['Virtual album name'] = 'Nazwa kategorii wirtualnej';
 $lang['Webmaster cannot be deleted'] = 'Nie można usunąć użytkownika Webmaster';
 $lang['You are running on development sources, no check possible.'] = 'Nie można sprawdzić, ponieważ używasz źródeł developer\'skich.';
 $lang['You cannot delete your account'] = "Nie możesz usunąć swojego konta";
-$lang['You cannot move a category in its own sub category'] = 'Nie możnesz przenieść kategorii do jej własnej podkategorii';
+$lang['You cannot move a album in its own sub album'] = 'Nie możnesz przenieść kategorii do jej własnej podkategorii';
 $lang['You need to confirm deletion'] = 'Musisz potwierdzić usunięcie';
 $lang['add tags'] = 'dodaj tagi';
 $lang['Adviser'] = 'Doradca';
-$lang['associate to category'] = 'powiązane z kategorią';
+$lang['Associate to album'] = 'powiązane z kategorią';
 $lang['associate to group'] = 'powiązane z grupą';
 $lang['Authorized'] = 'Zautoryzowane';
 $lang['Add a virtual album'] = 'Dodaj wirualną kategorię';
 $lang['Authorize users to add comments on selected categories'] = 'Autoryzuj użytkowników by mogli dodawać komentarze do wybranych kategorii';
-$lang['The name of a category should not be empty'] = 'Nazwa kategorii nie może być pusta';
+$lang['The name of an album must not be empty'] = 'Nazwa kategorii nie może być pusta';
 $lang['Lock albums'] = 'Zablokuj kategorie';
 $lang['Private'] = 'Kategoria prywatna';
 $lang['Public'] = 'Kategoria publiczna';
@@ -214,11 +213,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = 'Lic
 $lang['Configuration'] = 'Konfiguracja';
 $lang['confirm'] = 'potwierdź';
 $lang['Date'] = 'Data';
-$lang['delete category'] = 'usuń kategorię';
-$lang['dissociate from category'] = 'usuń powiązanie od kategorii';
+$lang['delete album'] = 'usuń kategorię';
+$lang['Dissociate from album'] = 'usuń powiązanie od kategorii';
 $lang['dissociate from group'] = 'usuń powiązanie od grupy';
-$lang['edit category permissions'] = 'edytuj uprawnienia kategorii';
-$lang['Category informations updated successfully.'] = 'Informacje o kategorii zaktualizowano pomyślnie.';
+$lang['edit album permissions'] = 'edytuj uprawnienia kategorii';
+$lang['Album updated successfully'] = 'Informacje o kategorii zaktualizowano pomyślnie.';
 $lang['Authorize upload'] = 'Zautoryzuj upload';
 $lang['elements per page'] = 'elementów na stronę';
 $lang['elements'] = 'elementy';
@@ -236,13 +235,13 @@ $lang['The name of a group must not contain " or \' or be empty.'] = 'Nazwa grup
 $lang['This name is already used by another group.'] = 'NAzwa jest już używana przez inną grupę.';
 $lang[''] = '';
 $lang['High definition'] = 'Wysoka jakość';
-$lang['jump to category'] = 'przejdź do kategorii';
+$lang['jump to album'] = 'przejdź do kategorii';
 $lang['jump to image'] = 'przejdź do obrazu';
 $lang['leave'] = 'opuść';
 $lang['Lock'] = 'Zablokuj';
 $lang['Locked'] = 'Zablokowane';
-$lang['manage category elements'] = 'zarządzaj elementami kategorii';
-$lang['manage sub-categories'] = 'zarządzaj podkategoriami';
+$lang['manage album elements'] = 'zarządzaj elementami kategorii';
+$lang['manage sub-albums'] = 'zarządzaj podkategoriami';
 $lang['Manage'] = 'Zarządzaj';
 $lang['maximum height'] = 'maksymalna wysokość';
 $lang['maximum width'] = 'maksymalna szerokość';
@@ -388,7 +387,7 @@ $lang['for this file format'] = 'dla tego rodzaju plików';
 $lang['unit mode'] = 'tryb jednostkowy';
 $lang['Unlocked'] = 'Odblokowane';
 $lang['unset'] = 'nie ustawione';
-$lang['Update categories informations'] = 'Aktualizuj informacje o kategoriach';
+$lang['Update albums informations'] = 'Aktualizuj informacje o kategoriach';
 $lang['Update images informations'] = 'Aktualizuj informacje o obrazach';
 $lang['Synchronize'] = 'Synchronizuj';
 $lang['reduce to single existing categories'] = 'zredukuj do pojedynczej istniejącej kategorii';
@@ -648,7 +647,7 @@ $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Tw
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Dodaj prawa do zapisu (chmod 777) do katalogu "%s" w głównym katalogu Twojej instalacji Piwigo';
 $lang['existing category'] = 'istniejąca kategoria';
 $lang['create a new category'] = 'stwórz nową kategorię';
-$lang['Category name'] = 'Nazwa kategorii';
+$lang['Album name'] = 'Nazwa kategorii';
 $lang['Category "%s" has been added'] = 'Kategoria "%s" została dodana';
 $lang['Uploaded Photos'] = 'Wgrane zdjęcia';
 $lang['%d photos uploaded'] = '%d wgranych zdjęć';
diff --git a/language/pt_BR/admin.lang.php b/language/pt_BR/admin.lang.php
index 635d4ebf8..7d55c1671 100644
--- a/language/pt_BR/admin.lang.php
+++ b/language/pt_BR/admin.lang.php
@@ -65,7 +65,7 @@ $lang['Caddie management'] = 'Gerenciamento da cesta';
 $lang['Caddie'] = 'Cesta';
 $lang['Categories authorized thanks to group associations'] = 'Categorias autorizadas graças a associações de grupo';
 $lang['Album manual order was saved'] = 'A ordem manual das categorias foi salva';
-$lang['Category elements associated to the following categories: %s'] = 'Itens da categoria associados às seguintes categorias: %s';
+$lang['Album elements associated to the following albums: %s'] = 'Itens da categoria associados às seguintes categorias: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'A checagem por atualização falhou por razões desconhecidas.';
 $lang['Check for upgrade'] = 'Checar por atualização';
 $lang['Comments for all'] = 'Comentários para todos';
@@ -103,12 +103,12 @@ $lang['Guests'] = 'Visitantes';
 $lang['History'] = 'Histórico';
 $lang['Informations'] = 'Informações';
 $lang['Install'] = 'Instalar';
-$lang['Link all category elements to a new category'] = 'Vincular (lincar) todos os itens da categoria a uma nova categoria';
-$lang['Link all category elements to some existing categories'] = 'Vincular (lincar) todos os itens da categoria a alguma(s) categoria existente';
+$lang['Link all album elements to a new album'] = 'Vincular (lincar) todos os itens da categoria a uma nova categoria';
+$lang['Link all album elements to some existing albums'] = 'Vincular (lincar) todos os itens da categoria a alguma(s) categoria existente';
 $lang['Linked albums'] = 'Categorias vinculadas (Linked)';
 $lang['Lock gallery'] = 'Trancar a  galeria';
 $lang['Maintenance'] = 'Manutenção';
-$lang['Manage permissions for a category'] = 'Gerenciar permissões da categoria';
+$lang['Edit album permissions'] = 'Gerenciar permissões da categoria';
 $lang['Manage permissions for group "%s"'] = 'Gerenciar permissões do grupo "%s"';
 $lang['Manage permissions for user "%s"'] = 'Gerenciar permissões do usuário "%s"';
 $lang['Manage tags'] = 'Gerenciar tags';
@@ -156,7 +156,7 @@ $lang['Representative'] = 'Representativo';
 $lang['Represents'] = 'Representa';
 $lang['Save order'] = 'Salvar ordem';
 $lang['Save to permalink history'] = 'Salvar no histórico permalink';
-$lang['Select at least one category'] = 'Selecionar ao menos uma categoria';
+$lang['Select at least one album'] = 'Selecionar ao menos uma categoria';
 $lang['Select at least one picture'] = 'Selecionar ao menos uma imagem';
 $lang['Select at least one user'] = 'Selecionar ao menos um usuário';
 $lang['Show info'] = 'Mostrar info';
@@ -179,22 +179,21 @@ $lang['Validate All'] = 'Aprovar tudo';
 $lang['Validate'] = 'Aprovar';
 $lang['Validation'] = 'Aprovação';
 $lang['Version'] = 'Versão';
-$lang['Virtual categories movement'] = 'Categorias virtuais movement';
-$lang['Virtual categories to move'] = 'Categorias virtuais a serem movidas';
+$lang['Virtual albums to move'] = 'Categorias virtuais a serem movidas';
 $lang['Virtual album name'] = 'Nome da categoria virtual';
 $lang['Webmaster cannot be deleted'] = 'Webmaster não pode ser apagado';
 $lang['You are running on development sources, no check possible.'] = 'Você está navegando em fontes de desenvolvimento, nenhuma checagem é possível.';
 $lang['You cannot delete your account'] = "Você não pode apagar sua conta";
-$lang['You cannot move a category in its own sub category'] = 'Você não pode mover uma categoria em sua própria sub categoria.';
+$lang['You cannot move a album in its own sub album'] = 'Você não pode mover uma categoria em sua própria sub categoria.';
 $lang['You need to confirm deletion'] = 'Você precisa confirmar a remoção';
 $lang['add tags'] = 'adicionar tags';
 $lang['Adviser'] = 'Conselheiro';
-$lang['associate to category'] = 'associar à categoria';
+$lang['Associate to album'] = 'associar à categoria';
 $lang['associate to group'] = 'associar ao grupo';
 $lang['Authorized'] = 'Autorizado';
 $lang['Add a virtual album'] = 'Adicionar uma categoria virtual';
 $lang['Authorize users to add comments on selected categories'] = 'Autorizar os usuários a adicionar comentários nas categorias selecionadas';
-$lang['The name of a category should not be empty'] = 'O nome de uma categoria não deveria ser vazio';
+$lang['The name of an album must not be empty'] = 'O nome de uma categoria não deveria ser vazio';
 $lang['Lock albums'] = 'Trancar categorias';
 $lang['Private'] = 'Categorias privadas';
 $lang['Public'] = 'Categorias públicas';
@@ -215,11 +214,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = 'O n
 $lang['Configuration'] = 'Configuração';
 $lang['confirm'] = 'confirmar';
 $lang['Date'] = 'Data';
-$lang['delete category'] = 'apagar categoria';
-$lang['dissociate from category'] = 'desassociar da categoria';
+$lang['delete album'] = 'apagar categoria';
+$lang['Dissociate from album'] = 'desassociar da categoria';
 $lang['dissociate from group'] = 'desassociar do grupo';
-$lang['edit category permissions'] = 'editar as permissões da categoria';
-$lang['Category informations updated successfully.'] = 'As informações da categoria foram atualizadas com sucesso.';
+$lang['edit album permissions'] = 'editar as permissões da categoria';
+$lang['Album updated successfully'] = 'As informações da categoria foram atualizadas com sucesso.';
 $lang['Authorize upload'] = 'Upload (envio) autorizado';
 $lang['elements per page'] = 'itens por página';
 $lang['elements'] = 'itens';
@@ -237,13 +236,13 @@ $lang['The name of a group must not contain " or \' or be empty.'] = 'O nome de
 $lang['This name is already used by another group.'] = 'Este nome já está sendo usado por outro grupo.';
 $lang[''] = '';
 $lang['High definition'] = 'Alta definição';
-$lang['jump to category'] = 'pular para categoria';
+$lang['jump to album'] = 'pular para categoria';
 $lang['jump to image'] = 'pular para imagem';
 $lang['leave'] = 'deixar (leave)';
 $lang['Lock'] = 'Trancar (Lock)';
 $lang['Locked'] = 'Trancado(a) (Locked)';
-$lang['manage category elements'] = 'gerenciar os itens da categoria';
-$lang['manage sub-categories'] = 'gerenciar subcategorias';
+$lang['manage album elements'] = 'gerenciar os itens da categoria';
+$lang['manage sub-albums'] = 'gerenciar subcategorias';
 $lang['Manage'] = 'Gerenciar';
 $lang['maximum height'] = 'altura máxima';
 $lang['maximum width'] = 'largura máxima';
@@ -389,7 +388,7 @@ $lang['for this file format'] = 'para este formato de arquivo';
 $lang['unit mode'] = 'modo unitário';
 $lang['Unlocked'] = 'Destrancado (Unlocked)';
 $lang['unset'] = 'sem valor (não ajustado)';
-$lang['Update categories informations'] = 'Atualizar as informações das categorias';
+$lang['Update albums informations'] = 'Atualizar as informações das categorias';
 $lang['Update images informations'] = 'Atualizar as informações das imagens';
 $lang['Synchronize'] = 'Sincronizar';
 $lang['reduce to single existing categories'] = 'reduzir as categorias existentes em apenas uma';
diff --git a/language/pt_PT/admin.lang.php b/language/pt_PT/admin.lang.php
index 8862868fd..47897e202 100644
--- a/language/pt_PT/admin.lang.php
+++ b/language/pt_PT/admin.lang.php
@@ -65,7 +65,7 @@ $lang['Caddie management'] = 'Gerenciamento do carrinho';
 $lang['Caddie'] = 'Carrinho';
 $lang['Categories authorized thanks to group associations'] = 'Categorias autorizadas graças a associações de grupo';
 $lang['Album manual order was saved'] = 'A ordem manual das categorias foi salva';
-$lang['Category elements associated to the following categories: %s'] = 'Elementos da categoria associados às seguintes categorias: %s';
+$lang['Album elements associated to the following albums: %s'] = 'Elementos da categoria associados às seguintes categorias: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'A procura de atualização falhou por razões desconhecidas.';
 $lang['Check for upgrade'] = 'procurar por atualização';
 $lang['Comments for all'] = 'Comentários para todos';
@@ -103,12 +103,12 @@ $lang['Guests'] = 'Visitantes';
 $lang['History'] = 'Histórico';
 $lang['Informations'] = 'Informações';
 $lang['Install'] = 'Instalar';
-$lang['Link all category elements to a new category'] = 'Vincular (lincar) todos os elementos da categoria a uma nova categoria';
-$lang['Link all category elements to some existing categories'] = 'Vincular (lincar) todos os elementos da categoria a alguma(s) categoria existente';
+$lang['Link all album elements to a new album'] = 'Vincular (lincar) todos os elementos da categoria a uma nova categoria';
+$lang['Link all album elements to some existing albums'] = 'Vincular (lincar) todos os elementos da categoria a alguma(s) categoria existente';
 $lang['Linked albums'] = 'Categorias vinculadas (Linked)';
 $lang['Lock gallery'] = 'Trancar a  galeria';
 $lang['Maintenance'] = 'Manutenção';
-$lang['Manage permissions for a category'] = 'Gerenciar permissões da categoria';
+$lang['Edit album permissions'] = 'Gerenciar permissões da categoria';
 $lang['Manage permissions for group "%s"'] = 'Gerenciar permissões do grupo "%s"';
 $lang['Manage permissions for user "%s"'] = 'Gerenciar permissões do usuário "%s"';
 $lang['Manage tags'] = 'Gerenciar tags';
@@ -156,7 +156,7 @@ $lang['Representative'] = 'Representativo';
 $lang['Represents'] = 'Representa';
 $lang['Save order'] = 'Salvar ordem';
 $lang['Save to permalink history'] = 'Salvar no histórico permalink';
-$lang['Select at least one category'] = 'Selecionar ao menos uma categoria';
+$lang['Select at least one album'] = 'Selecionar ao menos uma categoria';
 $lang['Select at least one picture'] = 'Selecionar ao menos uma imagem';
 $lang['Select at least one user'] = 'Selecionar ao menos um usuário';
 $lang['Show info'] = 'Mostrar info';
@@ -179,22 +179,21 @@ $lang['Validate All'] = 'Aprovar tudo';
 $lang['Validate'] = 'Aprovar';
 $lang['Validation'] = 'Aprovação';
 $lang['Version'] = 'Versão';
-$lang['Virtual categories movement'] = 'Categorias virtuais movement';
-$lang['Virtual categories to move'] = 'Categorias virtuais a serem movidas';
+$lang['Virtual albums to move'] = 'Categorias virtuais a serem movidas';
 $lang['Virtual album name'] = 'Nome da categoria virtual';
 $lang['Webmaster cannot be deleted'] = 'Webmaster não pode ser apagado';
 $lang['You are running on development sources, no check possible.'] = 'Você está a navegar em fontes de desenvolvimento, nenhuma checagem é possível.';
 $lang['You cannot delete your account'] = "Você não pode apagar sua conta";
-$lang['You cannot move a category in its own sub category'] = 'Você não pode mover uma categoria em sua própria sub categoria.';
+$lang['You cannot move a album in its own sub album'] = 'Você não pode mover uma categoria em sua própria sub categoria.';
 $lang['You need to confirm deletion'] = 'Você precisa confirmar a remoção';
 $lang['add tags'] = 'adicionar tags';
 $lang['Adviser'] = 'Conselheiro';
-$lang['associate to category'] = 'associar à categoria';
+$lang['Associate to album'] = 'associar à categoria';
 $lang['associate to group'] = 'associar ao grupo';
 $lang['Authorized'] = 'Autorizado';
 $lang['Add a virtual album'] = 'Adicionar uma categoria virtual';
 $lang['Authorize users to add comments on selected categories'] = 'Autorizar os usuários a adicionar comentários nas categorias selecionadas';
-$lang['The name of a category should not be empty'] = 'O nome de uma categoria não deveria ser vazio';
+$lang['The name of an album must not be empty'] = 'O nome de uma categoria não deveria ser vazio';
 $lang['Lock albums'] = 'Trancar categorias';
 $lang['Private'] = 'Categorias privadas';
 $lang['Public'] = 'Categorias públicas';
@@ -215,11 +214,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = 'O n
 $lang['Configuration'] = 'Configuração';
 $lang['confirm'] = 'confirmar';
 $lang['Date'] = 'Data';
-$lang['delete category'] = 'apagar categoria';
-$lang['dissociate from category'] = 'desassociar da categoria';
+$lang['delete album'] = 'apagar categoria';
+$lang['Dissociate from album'] = 'desassociar da categoria';
 $lang['dissociate from group'] = 'desassociar do grupo';
-$lang['edit category permissions'] = 'editar as permissões da categoria';
-$lang['Category informations updated successfully.'] = 'As informações da categoria foram atualizadas com sucesso.';
+$lang['edit album permissions'] = 'editar as permissões da categoria';
+$lang['Album updated successfully'] = 'As informações da categoria foram atualizadas com sucesso.';
 $lang['Authorize upload'] = 'Upload (envio) autorizado';
 $lang['elements per page'] = 'elementos por página';
 $lang['elements'] = 'elementos';
@@ -237,13 +236,13 @@ $lang['The name of a group must not contain " or \' or be empty.'] = 'O nome de
 $lang['This name is already used by another group.'] = 'Este nome já é usado por outro grupo.';
 $lang[''] = 'Alta definição desativada';
 $lang['High definition'] = 'Alta definição';
-$lang['jump to category'] = 'ir para categoria';
+$lang['jump to album'] = 'ir para categoria';
 $lang['jump to image'] = 'ir para imagem';
 $lang['leave'] = 'deixar (leave)';
 $lang['Lock'] = 'Trancar (Lock)';
 $lang['Locked'] = 'Trancado(a) (Locked)';
-$lang['manage category elements'] = 'gerenciar os elementos da categoria';
-$lang['manage sub-categories'] = 'gerenciar subcategorias';
+$lang['manage album elements'] = 'gerenciar os elementos da categoria';
+$lang['manage sub-albums'] = 'gerenciar subcategorias';
 $lang['Manage'] = 'Gerenciar';
 $lang['maximum height'] = 'altura máxima';
 $lang['maximum width'] = 'largura máxima';
@@ -389,7 +388,7 @@ $lang['for this file format'] = 'para este formato de arquivo';
 $lang['unit mode'] = 'modo unitário';
 $lang['Unlocked'] = 'Destrancado (Unlocked)';
 $lang['unset'] = 'sem valor (não ajustado)';
-$lang['Update categories informations'] = 'Atualizar as informações das categorias';
+$lang['Update albums informations'] = 'Atualizar as informações das categorias';
 $lang['Update images informations'] = 'Atualizar as informações das imagens';
 $lang['Synchronize'] = 'Sincronizar';
 $lang['reduce to single existing categories'] = 'reduzir as categorias existentes em apenas uma';
diff --git a/language/ru_RU/admin.lang.php b/language/ru_RU/admin.lang.php
index 29d0e8e17..6047747d6 100644
--- a/language/ru_RU/admin.lang.php
+++ b/language/ru_RU/admin.lang.php
@@ -65,7 +65,7 @@ $lang['Caddie management'] = 'Управление корзиной';
 $lang['Caddie'] = 'Корзина';
 $lang['Categories authorized thanks to group associations'] = 'Категории, разрешенные благодаря связи с группой';
 $lang['Album manual order was saved'] = 'Особый порядок категорий сохранен';
-$lang['Category elements associated to the following categories: %s'] = 'Фотографии категории, связаны со следующими категориями: %s';
+$lang['Album elements associated to the following albums: %s'] = 'Фотографии категории, связаны со следующими категориями: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'Проверка обновлений не удалась по неизвестным причинам.';
 $lang['Check for upgrade'] = 'Проверить обновления';
 $lang['Comments for all'] = 'Комментарии для всех';
@@ -103,12 +103,12 @@ $lang['Guests'] = 'Гости';
 $lang['History'] = 'История';
 $lang['Informations'] = 'Информация';
 $lang['Install'] = 'Установить';
-$lang['Link all category elements to a new category'] = 'Привязать все элементы этой категории к новой';
-$lang['Link all category elements to some existing categories'] = 'Привязать все элементы этой категории к одной из существующих';
+$lang['Link all album elements to a new album'] = 'Привязать все элементы этой категории к новой';
+$lang['Link all album elements to some existing albums'] = 'Привязать все элементы этой категории к одной из существующих';
 $lang['Linked albums'] = 'Привязанные категории';
 $lang['Lock gallery'] = 'Заблокировать галерею';
 $lang['Maintenance'] = 'Обслуживание';
-$lang['Manage permissions for a category'] = 'Управление разрешениями для категории';
+$lang['Edit album permissions'] = 'Управление разрешениями для категории';
 $lang['Manage permissions for group "%s"'] = 'Управление разрешениями для группы "%s"';
 $lang['Manage permissions for user "%s"'] = 'Управление разрешениями для пользователя "%s"';
 $lang['Manage tags'] = 'Управление словами';
@@ -156,7 +156,7 @@ $lang['Representative'] = 'Представитель';
 $lang['Represents'] = 'Представляет';
 $lang['Save order'] = 'Сохранить порядок';
 $lang['Save to permalink history'] = 'Сохранить историю постоянных ссылок';
-$lang['Select at least one category'] = 'Выберите хотя бы одну категорию';
+$lang['Select at least one album'] = 'Выберите хотя бы одну категорию';
 $lang['Select at least one picture'] = 'Выберите хотя бы одно изображение';
 $lang['Select at least one user'] = 'Выберите хотя бы одного пользователя';
 $lang['Show info'] = 'Показать информацию';
@@ -178,22 +178,21 @@ $lang['Validate All'] = 'Принять все';
 $lang['Validate'] = 'Принять';
 $lang['Validation'] = 'Проверка';
 $lang['Version'] = 'Версия';
-$lang['Virtual categories movement'] = 'Перемещение виртуальных категорий';
-$lang['Virtual categories to move'] = 'Виртуальные категории для перемещения';
+$lang['Virtual albums to move'] = 'Виртуальные категории для перемещения';
 $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'] = "Вы не можете удалить свой аккаунт";
-$lang['You cannot move a category in its own sub category'] = 'Вы не можете переместить категорию в ее собственную подкатегорию';
+$lang['You cannot move a album in its own sub album'] = 'Вы не можете переместить категорию в ее собственную подкатегорию';
 $lang['You need to confirm deletion'] = 'Вам нужно подтвердить удаление';
 $lang['add tags'] = 'добавить слова';
 $lang['Adviser'] = 'Помощник';
-$lang['associate to category'] = 'привязать к категории';
+$lang['Associate to album'] = 'привязать к категории';
 $lang['associate to group'] = 'привязать к группе';
 $lang['Authorized'] = 'Разрешено';
 $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['The name of an album must not be empty'] = 'Название категории не должно быть пустым';
 $lang['Lock albums'] = 'Заблокировать категории';
 $lang['Private'] = 'Приватная категория';
 $lang['Public'] = 'Общедоступная категория';
@@ -213,11 +212,11 @@ $lang['Main'] = 'Главная';
 $lang['The number of comments a page must be between 5 and 50 included.'] = 'На странице может быть от 5 до 50 комментариев.';
 $lang['Configuration'] = 'Настройки';
 $lang['confirm'] = 'подтверждение';
-$lang['delete category'] = 'удалить категорию';
-$lang['dissociate from category'] = 'отвязать от категории';
+$lang['delete album'] = 'удалить категорию';
+$lang['Dissociate from album'] = 'отвязать от категории';
 $lang['dissociate from group'] = 'отвязать от группы';
-$lang['edit category permissions'] = 'редактировать права для категории';
-$lang['Category informations updated successfully.'] = 'Информация о категории обновлена успешно.';
+$lang['edit album permissions'] = 'редактировать права для категории';
+$lang['Album updated successfully'] = 'Информация о категории обновлена успешно.';
 $lang['Authorize upload'] = 'Разрешить загрузку';
 $lang['elements per page'] = 'миниатюр на странице';
 $lang['elements'] = 'элементы';
@@ -234,13 +233,13 @@ $lang['group'] = 'группа';
 $lang['The name of a group must not contain " or \' or be empty.'] = 'Название группы не должно содержать " и \' или быть пустым.';
 $lang['This name is already used by another group.'] = 'Это название уже используется для другой группы.';
 $lang['High definition'] = 'Большое разрешение';
-$lang['jump to category'] = 'перейти в категорию';
+$lang['jump to album'] = 'перейти в категорию';
 $lang['jump to image'] = 'перейти к фотографии';
 $lang['leave'] = 'оставить';
 $lang['Lock'] = 'Блокировка';
 $lang['Locked'] = 'Заблокировано';
-$lang['manage category elements'] = 'управление фотографиями категории';
-$lang['manage sub-categories'] = 'управление подкатегориями';
+$lang['manage album elements'] = 'управление фотографиями категории';
+$lang['manage sub-albums'] = 'управление подкатегориями';
 $lang['Manage'] = 'Управление';
 $lang['maximum height'] = 'максимальная высота';
 $lang['maximum width'] = 'максимальная ширина';
@@ -386,7 +385,7 @@ $lang['for this file format'] = 'для этого формата файла';
 $lang['unit mode'] = 'одиночный режим';
 $lang['Unlocked'] = 'Разблокировать';
 $lang['unset'] = 'очистить';
-$lang['Update categories informations'] = 'обновить информацию о категориях';
+$lang['Update albums informations'] = 'обновить информацию о категориях';
 $lang['Update images informations'] = 'обновить информацию о фотографиях';
 $lang['Synchronize'] = 'Синхронизация';
 $lang['reduce to single existing categories'] = 'проверить только категорию';
@@ -644,7 +643,7 @@ $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'С
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Дайте доступ для записи (chmod 777) к "%s" каталогу в корне установленной Вами Piwigo';
 $lang['existing category'] = 'существующая категория';
 $lang['create a new category'] = 'создать новую категория';
-$lang['Category name'] = 'Имя категории';
+$lang['Album name'] = 'Имя категории';
 $lang['Category "%s" has been added'] = 'Категория "%s" добавлена';
 $lang['Uploaded Photos'] = 'Загруженные фотографии';
 $lang['%d photos uploaded'] = '%d фотографий загружено';
diff --git a/language/sr_RS/admin.lang.php b/language/sr_RS/admin.lang.php
index b349d6fef..39815a030 100644
--- a/language/sr_RS/admin.lang.php
+++ b/language/sr_RS/admin.lang.php
@@ -65,7 +65,7 @@ $lang['Caddie management'] = 'Kontrola fioke';
 $lang['Caddie'] = 'Fioka';
 $lang['Categories authorized thanks to group associations'] = 'Kategorije overene zahvaljujući grupnoj vezi';
 $lang['Album manual order was saved'] = 'Redosled kategorija je sačuvan';
-$lang['Category elements associated to the following categories: %s'] = 'Elementi kategorije povezane su sa sledećim kategorijama: %s';
+$lang['Album elements associated to the following albums: %s'] = 'Elementi kategorije povezane su sa sledećim kategorijama: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'Provera nadogradnje neuspešna iz nepoznatog razloga.';
 $lang['Check for upgrade'] = 'Provera nadogradnje';
 $lang['Comments for all'] = 'Komentari za sve';
@@ -103,12 +103,12 @@ $lang['Guests'] = 'Gostiju';
 $lang['History'] = 'Istorija';
 $lang['Informations'] = 'Informacije';
 $lang['Install'] = 'Instaliraj';
-$lang['Link all category elements to a new category'] = 'Poveži sve elemente kategorije sa novom kategorijom';
-$lang['Link all category elements to some existing categories'] = 'Poveži sve elemente kategorije sa nekom postojećom kategorijom';
+$lang['Link all album elements to a new album'] = 'Poveži sve elemente kategorije sa novom kategorijom';
+$lang['Link all album elements to some existing albums'] = 'Poveži sve elemente kategorije sa nekom postojećom kategorijom';
 $lang['Linked albums'] = 'Povezane kategorije';
 $lang['Lock gallery'] = 'Zaključaj galeriju';
 $lang['Maintenance'] = 'Održavanje';
-$lang['Manage permissions for a category'] = 'Upravljanje dozvolama za kategoriju';
+$lang['Edit album permissions'] = 'Upravljanje dozvolama za kategoriju';
 $lang['Manage permissions for group "%s"'] = 'Upravljanje dozvolama za grupu "%s"';
 $lang['Manage permissions for user "%s"'] = 'Upravljanje dozvolama za korisnika "%s"';
 $lang['Manage tags'] = 'Upravljanje oznakama';
@@ -156,7 +156,7 @@ $lang['Representative'] = 'Predstavljeno';
 $lang['Represents'] = 'Predstavlja';
 $lang['Save order'] = 'Snimi raspored';
 $lang['Save to permalink history'] = 'Snimi u istoriju stalnih veza';
-$lang['Select at least one category'] = 'Odaberite najmanje jednu kategoriju';
+$lang['Select at least one album'] = 'Odaberite najmanje jednu kategoriju';
 $lang['Select at least one picture'] = 'Odaberite najmanje jednu sliku';
 $lang['Select at least one user'] = 'Odaberite najmanje jednog korisnika';
 $lang['Show info'] = 'Prikaz podataka';
@@ -179,22 +179,21 @@ $lang['Validate All'] = 'Overi Sve';
 $lang['Validate'] = 'Overi';
 $lang['Validation'] = 'Overa';
 $lang['Version'] = 'Verzija';
-$lang['Virtual categories movement'] = 'Premeštanje virtuelnih kategorija';
-$lang['Virtual categories to move'] = 'Virtuelne kategorije za premeštanje';
+$lang['Virtual albums to move'] = 'Virtuelne kategorije za premeštanje';
 $lang['Virtual album name'] = 'Naziv virtuelne kategorije';
 $lang['Webmaster cannot be deleted'] = 'Webmaster ne može biti izbrisan';
 $lang['You are running on development sources, no check possible.'] = 'Vi koristite razvojni izvorni kod, provera nemoguća.';
 $lang['You cannot delete your account'] = "Ne možete izbrisati svoj nalog";
-$lang['You cannot move a category in its own sub category'] = 'Ne možete premestiti kategoriju u njenu podkategoriju';
+$lang['You cannot move a album in its own sub album'] = 'Ne možete premestiti kategoriju u njenu podkategoriju';
 $lang['You need to confirm deletion'] = 'Potvrdi brisanje';
 $lang['add tags'] = 'dodaj oznake';
 $lang['Adviser'] = 'Savetnik';
-$lang['associate to category'] = 'poveži sa kategorijom';
+$lang['Associate to album'] = 'poveži sa kategorijom';
 $lang['associate to group'] = 'poveži sa grupom';
 $lang['Authorized'] = 'Ovlašćeno';
 $lang['Add a virtual album'] = 'Dodaj virtuelnu kategoriju';
 $lang['Authorize users to add comments on selected categories'] = 'Ovlastite korisnike za davanje komentara u odabranim kategorijama';
-$lang['The name of a category should not be empty'] = 'Naziv kategorije ne bi trebao biti prazan';
+$lang['The name of an album must not be empty'] = 'Naziv kategorije ne bi trebao biti prazan';
 $lang['Lock albums'] = 'Zaključaj kategorije';
 $lang['Private'] = 'Lična kategorija';
 $lang['Public'] = 'Javna kategorija';
@@ -215,11 +214,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = 'Bro
 $lang['Configuration'] = 'Podešavanje';
 $lang['confirm'] = 'potvrdi';
 $lang['Date'] = 'Datum';
-$lang['delete category'] = 'obriši kategoriju';
-$lang['dissociate from category'] = 'odvoji od kategorije';
+$lang['delete album'] = 'obriši kategoriju';
+$lang['Dissociate from album'] = 'odvoji od kategorije';
 $lang['dissociate from group'] = 'odvoji od grupe';
-$lang['edit category permissions'] = 'uredi dozvole kategorije';
-$lang['Category informations updated successfully.'] = 'Podaci kategorije uspešno obnovljeni.';
+$lang['edit album permissions'] = 'uredi dozvole kategorije';
+$lang['Album updated successfully'] = 'Podaci kategorije uspešno obnovljeni.';
 $lang['Authorize upload'] = 'Odobri slanje';
 $lang['elements per page'] = 'elemenata po stranici';
 $lang['elements'] = 'elementi';
@@ -236,13 +235,13 @@ $lang['group'] = 'grupa';
 $lang['The name of a group must not contain " or \' or be empty.'] = 'Naziv grupe ne može sadržati  " ili \' ili biti prazan.';
 $lang['This name is already used by another group.'] = 'Ovaj naziv već koristi druga grupa.';
 $lang['High definition'] = 'Visoka rezolucija';
-$lang['jump to category'] = 'skok u kategoriju';
+$lang['jump to album'] = 'skok u kategoriju';
 $lang['jump to image'] = 'skok na sliku';
 $lang['leave'] = 'ostavi';
 $lang['Lock'] = 'Zaključaj';
 $lang['Locked'] = 'Zaključano';
-$lang['manage category elements'] = 'upravljanje elementima kategorije';
-$lang['manage sub-categories'] = 'upravljanje podkategorijama';
+$lang['manage album elements'] = 'upravljanje elementima kategorije';
+$lang['manage sub-albums'] = 'upravljanje podkategorijama';
 $lang['Manage'] = 'Upravljaj';
 $lang['maximum height'] = 'najveća visina';
 $lang['maximum width'] = 'najveća širina';
@@ -389,7 +388,7 @@ $lang['for this file format'] = 'za ovu vrstu datoteke';
 $lang['unit mode'] = 'pojedinačni način';
 $lang['Unlocked'] = 'Otključano';
 $lang['unset'] = 'razdešeno';
-$lang['Update categories informations'] = 'Obnovi podatke o kategorijama';
+$lang['Update albums informations'] = 'Obnovi podatke o kategorijama';
 $lang['Update images informations'] = 'Obnovi podatke o slikama';
 $lang['Synchronize'] = 'Sinhronizuj';
 $lang['reduce to single existing categories'] = 'umanji na jednu postojeću kategoriju-e';
@@ -646,7 +645,7 @@ $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Na
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Dozvoli upis (chmod 777) u "%s" direktorijum u korenu Vaše Piwigo instalcije';
 $lang['existing category'] = 'postojeće kategorije';
 $lang['create a new category'] = 'napravi novu kategoriju';
-$lang['Category name'] = 'Naziv kategorije';
+$lang['Album name'] = 'Naziv kategorije';
 $lang['Category "%s" has been added'] = 'Kategorija "%s" je dodata';
 $lang['Uploaded Photos'] = 'Pošalji fotografije';
 $lang['%d photos uploaded'] = '%d fotografije poslate';
diff --git a/language/vi_VN/admin.lang.php b/language/vi_VN/admin.lang.php
index 3a66417e3..3e479078f 100644
--- a/language/vi_VN/admin.lang.php
+++ b/language/vi_VN/admin.lang.php
@@ -66,7 +66,7 @@ $lang['Caddie'] = 'Caddie';
 $lang['Categories authorized thanks to group associations'] = 'Đề mục đã được cho phép nhờ vào kết hợp nhóm';

 $lang['Album manual order was saved'] = 'Sắp xếp thủ công đề mục đã được lưu';

 $lang['Categories ordered alphanumerically'] = 'Đề mục được sắp xếp theo thứ tự A,B,C...';

-$lang['Category elements associated to the following categories: %s'] = 'Các thành phần của đề mụ đã được kết hợp với những đề mục sau đây: %s';

+$lang['Album elements associated to the following albums: %s'] = 'Các thành phần của đề mụ đã được kết hợp với những đề mục sau đây: %s';

 $lang['Check for upgrade failed for unknown reasons.'] = 'Quá trình dò tìm phiên bản nâng cấp bị lỗi, không xác định được nguyên nhân.';

 $lang['Check for upgrade'] = 'Dò tìm phiên bản mới';

 $lang['Comments for all'] = 'Cho mọi đối tượng được phép gởi bình luận';

@@ -104,12 +104,12 @@ $lang['Guests'] = 'Khách';
 $lang['History'] = 'Bản ghi';

 $lang['Informations'] = 'Thông tin';

 $lang['Install'] = 'Cài đặt';

-$lang['Link all category elements to a new category'] = 'Liên kết tất cả các thành phần của đề mục này với một đề mục mới';

-$lang['Link all category elements to some existing categories'] = 'Liên kết tất cả các thành phần của đề mục này với một số đề mục trước';

+$lang['Link all album elements to a new album'] = 'Liên kết tất cả các thành phần của đề mục này với một đề mục mới';

+$lang['Link all album elements to some existing albums'] = 'Liên kết tất cả các thành phần của đề mục này với một số đề mục trước';

 $lang['Linked albums'] = 'Đã liên kết các đề mục trên';

 $lang['Lock gallery'] = 'Tạm khoá gallery';

 $lang['Maintenance'] = 'Bảo trì';

-$lang['Manage permissions for a category'] = 'Quản lý quyền truy xuất của một đề mục';

+$lang['Edit album permissions'] = 'Quản lý quyền truy xuất của một đề mục';

 $lang['Manage permissions for group "%s"'] = 'Quản lý quyền truy xuất của nhóm "%s"';

 $lang['Manage permissions for user "%s"'] = 'Quản lý quyền truy xuất của thành viên "%s"';

 $lang['Manage tags'] = 'Quản lý tags';

@@ -158,7 +158,7 @@ $lang['Representative'] = 'Đại diện';
 $lang['Represents'] = 'Hình đại diện';

 $lang['Save order'] = 'Lưu vị trí sắp xếp';

 $lang['Save to permalink history'] = 'Lưu vào bảng ghi cố định';

-$lang['Select at least one category'] = 'Chọn ít nhất một đề mục';

+$lang['Select at least one album'] = 'Chọn ít nhất một đề mục';

 $lang['Select at least one picture'] = 'Chọn ít nhất một hình ảnh';

 $lang['Select at least one user'] = 'Chọn ít nhất một người dùng';

 $lang['Show info'] = 'Hiển thị thông tin';

@@ -181,22 +181,21 @@ $lang['Validate All'] = 'Xác nhận tất cả';
 $lang['Validate'] = 'Xác nhận';

 $lang['Validation'] = 'Xác nhận';

 $lang['Version'] = 'Phiên bản';

-$lang['Virtual categories movement'] = 'Di chuyển đề mục ảo';

-$lang['Virtual categories to move'] = 'Đề mục ảo cần di chuyển';

+$lang['Virtual albums to move'] = 'Đề mục ảo cần di chuyển';

 $lang['Virtual album name'] = 'Tên đề mục ảo';

 $lang['Webmaster cannot be deleted'] = 'Webmaster không thể xoá được';

 $lang['You are running on development sources, no check possible.'] = 'Bạn đang sử dụng mã nguồn dạng phát triển, không thể kiểm tra được.';

 $lang['You cannot delete your account'] = "Bạn không thể tự xoá tài khoản của mình được";

-$lang['You cannot move a category in its own sub category'] = 'Bạn không thể dời một đề mục vào trong đề mục con của chính nó.';

+$lang['You cannot move a album in its own sub album'] = 'Bạn không thể dời một đề mục vào trong đề mục con của chính nó.';

 $lang['You need to confirm deletion'] = 'Bạn cần được xác nhận để xoá';

 $lang['add tags'] = 'Thêm các tags';

 $lang['Adviser'] = 'Tư vấn';

-$lang['associate to category'] = 'Kết hợp với đề mục';

+$lang['Associate to album'] = 'Kết hợp với đề mục';

 $lang['associate to group'] = 'kết hợp với nhóm người dùng';

 $lang['Authorized'] = 'Được cho phép';

 $lang['Add a virtual album'] = 'Thêm vào một đề mục ảo';

 $lang['Authorize users to add comments on selected categories'] = 'Cho phép người dùng có thể gởi bình luận ở các đề mục được chọn';

-$lang['The name of a category should not be empty'] = 'Tên của đề mục không được để trống';

+$lang['The name of an album must not be empty'] = 'Tên của đề mục không được để trống';

 $lang['Lock albums'] = 'Những đề mục bị khoá';

 $lang['Private'] = 'Đề mục riêng';

 $lang['Public'] = 'Đề mục chung (công cộng)';

@@ -217,11 +216,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = 'S�
 $lang['Configuration'] = 'Cấu hình';

 $lang['confirm'] = 'xác nhận';

 $lang['Date'] = 'Ngày tháng';

-$lang['delete category'] = 'xoá bỏ đề mục';

-$lang['dissociate from category'] = 'không kết hợp với đề mục';

+$lang['delete album'] = 'xoá bỏ đề mục';

+$lang['Dissociate from album'] = 'không kết hợp với đề mục';

 $lang['dissociate from group'] = 'Không kết hợp với nhóm người dùng';

-$lang['edit category permissions'] = 'thay đổi quyền truy cập của đề mục';

-$lang['Category informations updated successfully.'] = 'Thông tin của đề mục đã được cập nhập thành công.';

+$lang['edit album permissions'] = 'thay đổi quyền truy cập của đề mục';

+$lang['Album updated successfully'] = 'Thông tin của đề mục đã được cập nhập thành công.';

 $lang['Authorize upload'] = 'Được phép gởi hình';

 $lang['elements per page'] = 'thành phần trên mỗi trang';

 $lang['elements'] = 'thành phần';

@@ -238,13 +237,13 @@ $lang['group'] = 'nhóm người dùng';
 $lang['The name of a group must not contain " or \' or be empty.'] = 'Tên của nhóm người dùng không có ký tự "\' hoặc bỏ trống.';

 $lang['This name is already used by another group.'] = 'Tên nhóm đã được đặt cho nhóm người dùng trước đó.';

 $lang['High definition'] = 'Định dạng cao';

-$lang['jump to category'] = 'nhảy đến đề mục';

+$lang['jump to album'] = 'nhảy đến đề mục';

 $lang['jump to image'] = 'nhảy đến hình';

 $lang['leave'] = 'để';

 $lang['Lock'] = 'Khoá';

 $lang['Locked'] = 'Đã khoá';

-$lang['manage category elements'] = 'quản lý các thành phần đề mục';

-$lang['manage sub-categories'] = 'quản lý các đề mục con';

+$lang['manage album elements'] = 'quản lý các thành phần đề mục';

+$lang['manage sub-albums'] = 'quản lý các đề mục con';

 $lang['Manage'] = 'Quản lý';

 $lang['maximum height'] = 'Chiều cao tối đa';

 $lang['maximum width'] = 'Chiều rộng tối đa';

@@ -390,7 +389,7 @@ $lang['for this file format'] = 'dành cho định dạng file này';
 $lang['unit mode'] = 'chế độ đơn vị hình';

 $lang['Unlocked'] = 'Bỏ khóa';

 $lang['unset'] = 'không đặt';

-$lang['Update categories informations'] = 'Cập nhật thông tin của đề mục';

+$lang['Update albums informations'] = 'Cập nhật thông tin của đề mục';

 $lang['Update images informations'] = 'Cập nhật thông tin của hình ảnh';

 $lang['Synchronize'] = 'Đồng bộ hóa';

 $lang['reduce to single existing categories'] = 'rút gọn về đề mục đơn đang tồn tại';

diff --git a/language/zh_CN/admin.lang.php b/language/zh_CN/admin.lang.php
index 724a5ddc7..21a86fb16 100644
--- a/language/zh_CN/admin.lang.php
+++ b/language/zh_CN/admin.lang.php
@@ -65,7 +65,7 @@ $lang['Caddie management'] = '购物篮管理';
 $lang['Caddie'] = '购物篮';
 $lang['Categories authorized thanks to group associations'] = '同组成员可以访问授权类';
 $lang['Album manual order was saved'] = '类手动排序已保存';
-$lang['Category elements associated to the following categories: %s'] = '本类成员与如下类产生关联: %s';
+$lang['Album elements associated to the following albums: %s'] = '本类成员与如下类产生关联: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = '因未知原因导致更新检测失败.';
 $lang['Check for upgrade'] = '检测更新';
 $lang['Comments for all'] = '对所有成员进行评论';
@@ -103,12 +103,12 @@ $lang['Guests'] = '游客';
 $lang['History'] = '历史';
 $lang['Informations'] = '信息';
 $lang['Install'] = '安装';
-$lang['Link all category elements to a new category'] = '把所有本类中的成员关联到一个新类';
-$lang['Link all category elements to some existing categories'] = '把所有本类中的成员关联到已存在类中';
+$lang['Link all album elements to a new album'] = '把所有本类中的成员关联到一个新类';
+$lang['Link all album elements to some existing albums'] = '把所有本类中的成员关联到已存在类中';
 $lang['Linked albums'] = '关联类';
 $lang['Lock gallery'] = '冻结图库';
 $lang['Maintenance'] = '维护';
-$lang['Manage permissions for a category'] = '对类进行权限管理';
+$lang['Edit album permissions'] = '对类进行权限管理';
 $lang['Manage permissions for group "%s"'] = '对组 "%s" 进行权限管理';
 $lang['Manage permissions for user "%s"'] = '对用户 "%s" 进行权限管理';
 $lang['Manage tags'] = '标签管理';
@@ -156,7 +156,7 @@ $lang['Representative'] = '代理人';
 $lang['Represents'] = '代理';
 $lang['Save order'] = '保存排序';
 $lang['Save to permalink history'] = '保存到固定链接的历史记录中';
-$lang['Select at least one category'] = '至少选中一个类';
+$lang['Select at least one album'] = '至少选中一个类';
 $lang['Select at least one picture'] = '至少选中一张图片';
 $lang['Select at least one user'] = '至少选中一个用户';
 $lang['Show info'] = '显示所有信息';
@@ -179,22 +179,21 @@ $lang['Validate All'] = '确认所有评论';
 $lang['Validate'] = '确认';
 $lang['Validation'] = '确认';
 $lang['Version'] = '版本';
-$lang['Virtual categories movement'] = '移动虚拟类';
-$lang['Virtual categories to move'] = '将要移动的虚拟类';
+$lang['Virtual albums to move'] = '将要移动的虚拟类';
 $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'] = "你不能删除自己本身帐号";
-$lang['You cannot move a category in its own sub category'] = '你不能把类移到它本身子类中';
+$lang['You cannot move a album in its own sub album'] = '你不能把类移到它本身子类中';
 $lang['You need to confirm deletion'] = '你必须确认删除操作';
 $lang['add tags'] = '增加标签';
 $lang['Adviser'] = '顾问';
-$lang['associate to category'] = '关联到类';
+$lang['Associate to album'] = '关联到类';
 $lang['associate to group'] = '关联到组';
 $lang['Authorized'] = '授权';
 $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['The name of an album must not be empty'] = '类名不能为空';
 $lang['Lock albums'] = '冻结类';
 $lang['Private'] = '私类';
 $lang['Public'] = '公类';
@@ -215,11 +214,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = '每
 $lang['Configuration'] = '设置';
 $lang['confirm'] = '设置';
 $lang['Date'] = '日期';
-$lang['delete category'] = '删除类';
-$lang['dissociate from category'] = '取消类关联';
+$lang['delete album'] = '删除类';
+$lang['Dissociate from album'] = '取消类关联';
 $lang['dissociate from group'] = '取消组关联';
-$lang['edit category permissions'] = '修改类权限';
-$lang['Category informations updated successfully.'] = '类信息成功更新.';
+$lang['edit album permissions'] = '修改类权限';
+$lang['Album updated successfully'] = '类信息成功更新.';
 $lang['Authorize upload'] = '允许上传图片';
 $lang['elements per page'] = '每页图片';
 $lang['elements'] = '图';
@@ -236,13 +235,13 @@ $lang['group'] = '组';
 $lang['The name of a group must not contain " or \' or be empty.'] = '组名不能包含 " 或 \' 并不能为空.';
 $lang['This name is already used by another group.'] = '组名已存在.';
 $lang['High definition'] = '高清';
-$lang['jump to category'] = '跳转到类';
+$lang['jump to album'] = '跳转到类';
 $lang['jump to image'] = '跳转到图';
 $lang['leave'] = '开锁';
 $lang['Lock'] = '上锁';
 $lang['Locked'] = '锁定';
-$lang['manage category elements'] = '管理类成员';
-$lang['manage sub-categories'] = '管理子类';
+$lang['manage album elements'] = '管理类成员';
+$lang['manage sub-albums'] = '管理子类';
 $lang['Manage'] = '管理';
 $lang['maximum height'] = '最高高度';
 $lang['maximum width'] = '最长长度';
@@ -388,7 +387,7 @@ $lang['for this file format'] = '对于此文件格式';
 $lang['unit mode'] = '单一模式';
 $lang['Unlocked'] = '解锁';
 $lang['unset'] = '清空';
-$lang['Update categories informations'] = '更新类信息';
+$lang['Update albums informations'] = '更新类信息';
 $lang['Update images informations'] = '更新图信息';
 $lang['Synchronize'] = '同步';
 $lang['reduce to single existing categories'] = '只能处理一个类';
@@ -638,7 +637,7 @@ $lang['Create the "%s" directory at the root of your Piwigo installation'] = '�
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = '给予根目录下的 "%s" 目录写权限 (chmod 777) 以完成 Piwigo 的安装';
 $lang['existing category'] = '已存在类别';
 $lang['create a new category'] = '创建一个新类别';
-$lang['Category name'] = '类别名称';
+$lang['Album name'] = '类别名称';
 $lang['Category "%s" has been added'] = '类别 "%s" 已添加';
 $lang['Uploaded Photos'] = '相片已上传';
 $lang['%d photos uploaded'] = '%d 相片已上传';