feature 1616: rename "category" into "album" (4th commit; almost there)

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

49 files changed, 522 insertions, 569 deletions

diff --git a/language/ar_SA/admin.lang.php b/language/ar_SA/admin.lang.php
index af44443ae..37270ce92 100644
--- a/language/ar_SA/admin.lang.php
+++ b/language/ar_SA/admin.lang.php
@@ -59,11 +59,10 @@ $lang['Add'] = 'أضف';
 $lang['Allow user registration'] = 'السماح للمستخدمين بالتسجيل';
 $lang['Apply to sub-albums'] = 'التطبيق على الألبوم الفرعي';
 $lang['Associated'] = 'مرتبط';
-$lang['Association to categories'] = 'الربط الي الألبومات';
 $lang['Batch management'] = 'ادارة التحويل';
 $lang['Caddie management'] = 'ادارة السلة';
 $lang['Caddie'] = 'السلة';
-$lang['Categories authorized thanks to group associations'] = 'تم المصادقة عى الألبومات ، شكرا لله';
+$lang['Albums authorized thanks to group associations'] = 'تم المصادقة عى الألبومات ، شكرا لله';
 $lang['Album manual order was saved'] = 'طلب الألبومات اليدوية تم حفظه';
 $lang['Album elements associated to the following albums: %s'] = 'تنصيف العناصر المرتبطة الى الفئات التالية: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'لم يتم التحدث لاسباب غير معروفه.';
@@ -123,17 +122,17 @@ $lang['New tag'] = 'كلمة جديد';
 $lang['Number of comments per page'] = 'عدد التلعيقات في الصفحة';
 $lang['Number of rates'] = 'عدد التقيمات';
 $lang['Number of thumbnails to create'] = 'عدد المصغرات المنشأة';
-$lang['Only private categories are listed'] = 'فقط للألبومات المدرجة';
+$lang['Only private albums are listed'] = 'فقط للألبومات المدرجة';
 $lang['Operating system'] = 'نظام المعالجة';
 $lang['Options'] = 'الخيارات';
-$lang['Other private categories'] = 'ألبومات أخرى مدرجة';
+$lang['Other private albums'] = 'ألبومات أخرى مدرجة';
 $lang['Page banner'] = 'عنوان المعرض ( أعلى الصفحة) يمكنك استخدام HTML';
 $lang['Parent album'] = 'الألبوم الرئيسي';
 $lang['Path'] = 'مسار';
 $lang['Permalink'] = 'رابط دائم';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'الرابط الدائم %sكان يستخدم من قبل الألبوم سابقا أحذفه   اولا من تاريخ %sالرابط الدائم';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'الرابط الدائم %sكان يستخدم من قبل الألبوم سابقا أحذفه   اولا من تاريخ %sالرابط الدائم';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'يجب ان يكون الرابط من الحروف الانجليزية   فقط مع امكانية استخدام الارقام ';
-$lang['Permalink %s is already used by category %s'] = 'هذا الرابط   %s بمستخدم من قبل هذا الألبوم ـ%s ';
+$lang['Permalink %s is already used by album %s'] = 'هذا الرابط   %s بمستخدم من قبل هذا الألبوم ـ%s ';
 $lang['Permalink history'] = 'سجل الرابط الدائم';
 $lang['Permalinks'] = 'الروابط الدائمة';
 $lang['Permission denied'] = 'تصريح مرفوض';
@@ -151,7 +150,7 @@ $lang['Rating'] = 'تقييم';
 $lang['Reject All'] = 'رفض الجميع';
 $lang['Reject'] = 'رفض';
 $lang['Representant'] = ' موصوف أو مُـمثل';
-$lang['Representation of categories'] = 'توصيف الألبومات';
+$lang['Representation of albums'] = 'توصيف الألبومات';
 $lang['Representative'] = 'التوصيف  أو التمثيل';
 $lang['Represents'] = 'يُـمثل';
 $lang['Save order'] = 'حفظ المطلوب';
@@ -184,7 +183,7 @@ $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 album in its own sub album'] = 'لايمكن حذف ألبوم يحتوي على ألبوم فرعي';
+$lang['You cannot move an album in its own sub album'] = 'لايمكن حذف ألبوم يحتوي على ألبوم فرعي';
 $lang['You need to confirm deletion'] = 'تحتاج  تأكيد الحذف';
 $lang['add tags'] = 'اضافةكلمة دلائلية';
 $lang['Adviser'] = 'مرشد';
@@ -192,18 +191,17 @@ $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['Authorize users to add comments on selected albums'] = 'السماح للمستخدمين باضافة تعليق على ألبومات معينة';
 $lang['The name of an album must not be empty'] = 'لا يمكن ان  تبقي اسم الألبوم خالي';
 $lang['Lock albums'] = 'قفل الألبوم';
 $lang['Private'] = 'ألبوم خاص';
 $lang['Public'] = 'ألبوم عام';
 $lang['Find a new representant by random'] = 'اظهر  جديد التواصيف او التمثيل بطريقة عشوائية';
 $lang['Public / Private'] = 'العام/ الخاص';
-$lang['Manage authorizations for selected categories'] = 'ادارة  تصريح التعليقات على الألبومات';
-$lang['Select uploadable categories'] = 'اختيارالألبوم المحمل';
+$lang['Manage authorizations for selected albums'] = 'ادارة  تصريح التعليقات على الألبومات';
+$lang['Select uploadable albums'] = 'اختيارالألبوم المحمل';
 $lang['Virtual album added'] = 'الألبوم المضاف';
 $lang['Virtual album deleted'] = 'الألبوم المحذوف';
-$lang['Category'] = 'الألبوم';
 $lang['Access type'] = 'طريقة الدخول';
 $lang['Comments'] = 'التعليقات';
 $lang['Information data registered in database'] = '     تم تحديث المعرض بنجاح  ';
@@ -358,10 +356,10 @@ $lang['synchronize metadata'] = 'مزامنة البيانات الوصفية';
 $lang['target'] = 'الهـدف';
 $lang['Thumbnail'] = 'المــصغرة';
 $lang['title'] = 'العنوان';
-$lang['Categories management'] = 'إدارة الألبومات';
+$lang['Album list management'] = 'إدارة الألبومات';
 $lang['Piwigo configuration'] = 'تهيئة المعرض';
 $lang['Piwigo administration'] = 'أدارة المعرض';
-$lang['Edit a category'] = 'تحرير الألبوم';
+$lang['Edit album'] = 'تحرير الألبوم';
 $lang['Group management'] = 'ادارة المجموعات';
 $lang['User list'] = 'قائمة المستخدم';
 $lang['Modify informations about a picture'] = 'تعديل معلومات عن الصورة';
@@ -392,9 +390,9 @@ $lang['unset'] = 'غير مهيأ';
 $lang['Update albums informations'] = 'تحديث ملعومات الألبومات';
 $lang['Update images informations'] = 'تحديث معلومات الصور';
 $lang['Synchronize'] = 'التزامن';
-$lang['reduce to single existing categories'] = 'تقليص الألبومات الحاليه';
+$lang['reduce to single existing albums'] = 'تقليص الألبومات الحاليه';
 $lang['Choose an option'] = 'اختر واحد من الخيارات';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = 'الحد الاقصى لعرض الملعومات (حذف ،اضافة صور او ألبومات)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = 'الحد الاقصى لعرض الملعومات (حذف ،اضافة صور او ألبومات)';
 $lang['Piwigo version differs on the remote site'] = 'الاصدار في هذا الموقع مختلف عن اصدار المعرض الحالي';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'يجب ان يكون اصدار create_listing_file.php على الموقع البعيد نفس الاصدار';
 $lang['listing.xml file was not found'] = 'ملف القائمة.xml غير موجود';
@@ -406,12 +404,12 @@ $lang['File/directory read error'] = 'خطأ في قراءة ملف/دليل';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'ملف أو دليل لا يمكن الوصول إليها (أي أنه لا وجود لها ، أو منعوا من الدخول)';
 $lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'صورة من الملفات تتطلب المصغرة. الصورة المصغرة يجب أن يكون موجودا في الدليل الفرعي "المصغرة" من فئة الدليل. اسم ملف الصورة المصغرة يجب أن تبدأ مع تهيئتها المصغرة البادئة والتمديد يجب أن تكون ضمن القائمة التالية :';
 $lang['missing thumbnail'] = 'مصغرات مفقودة';
-$lang['categories deleted in the database'] = 'الألبومات محذوفة من قاعدة البيانات';
+$lang['albums deleted in the database'] = 'الألبومات محذوفة من قاعدة البيانات';
 $lang['elements deleted in the database'] = 'الصور محذوفة من قاعدة البيانات';
 $lang['images candidates for metadata synchronization'] = 'تزامن المعلومات التفصيلة للصور المرشحه';
 $lang['elements informations synchronized with files metadata'] = 'ملعومات الصور متزامنة مع المعلومات التفصيلة للصور';
 $lang['errors during synchronization'] = 'أخطاء اثناء التزامن';
-$lang['categories added in the database'] = 'ألبومات اضيفت في قاعدة البيانات';
+$lang['albums added in the database'] = 'ألبومات اضيفت في قاعدة البيانات';
 $lang['elements added in the database'] = 'صور اضيفت في قاعدة البيانات';
 $lang['elements updated in the database'] = 'تم تحديث الصور في قاعدة البيانات';
 $lang['Search for new images in the directories'] = 'البحث عن صور جديدة في الألبومات';
@@ -444,7 +442,7 @@ $lang['Toggle \'default group\' property'] = 'ترجيح \'مجموعة افتر
 $lang['Advanced features'] = 'مميزات متقدمة';
 $lang['Not linked elements'] = 'عناصر غير مربوطة';
 $lang['Specials'] = 'خــاص';
-$lang['Files with same name in more than one physical category'] = 'ملفات تحمل نفس الاسم في أكثر من ألبوم ';
+$lang['Files with same name in more than one physical album'] = 'ملفات تحمل نفس الاسم في أكثر من ألبوم ';
 
 $lang['Overall'] = 'اجماليا';
 $lang['Year'] = 'سنة';
@@ -593,7 +591,7 @@ $lang['Templates configuration has been recorded.'] = 'تم تسجيل قاول�
 $lang['All optimizations have been successfully completed.'] = 'تمت عملية التحسينات بنجاح.';
 $lang['Optimizations have been completed with some errors.'] = 'اكتملت عملية التحسين مع بعض الاخطاء';
 $lang['Modify information'] = 'تعديل المعلومات';
-$lang['edit category informations'] = 'تحرير ملعومات الالبوم';
+$lang['edit album'] = 'تحرير ملعومات الالبوم';
 $lang['nothing'] = 'لا شيء';
 $lang['overrides existing values with empty ones'] = 'overrides existing values with empty ones';
 $lang['manage image ranks'] = 'إدارة ترتيب الصور';
diff --git a/language/ar_SA/common.lang.php b/language/ar_SA/common.lang.php
index 6ea26956d..c17690b57 100644
--- a/language/ar_SA/common.lang.php
+++ b/language/ar_SA/common.lang.php
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = 'على الاقل واح
 $lang['At least one tag must match'] = 'واحده على الاقل يجب انت تكون متطابقه مع..';
 $lang['Author'] = 'بواسطة:';
 $lang['Average rate'] = 'متوسط التصويت';
-$lang['Categories'] = 'الألبومات';
-$lang['Category'] = 'الألبوم';
+$lang['Albums'] = 'الألبومات';
+$lang['Album'] = 'الألبوم';
 $lang['Close this window'] = 'اغلق هذه النافذة';
 $lang['Complete RSS feed (images, comments)'] = 'تابع تحديثات الموقع من صور جديدة و تعليقات  عبر الاشتراك في هذه الخدمة RSS';
 $lang['Confirm Password'] = 'تأكيد كلمة المرور';
diff --git a/language/cs_CZ/admin.lang.php b/language/cs_CZ/admin.lang.php
index a843f26ab..dbf4a9123 100644
--- a/language/cs_CZ/admin.lang.php
+++ b/language/cs_CZ/admin.lang.php
@@ -62,11 +62,10 @@ $lang['Add'] = 'Přidat';
 $lang['Allow user registration'] = 'Povolit registraci uživatelů';
 $lang['Apply to sub-albums'] = 'Použít na podkategorie';
 $lang['Associated'] = 'Přiřazeno';
-$lang['Association to categories'] = 'Spojit s kategorií';
 $lang['Batch management'] = 'Správa dávkových úkonů';
 $lang['Caddie management'] = 'Správa košíku';
 $lang['Caddie'] = 'Košík';
-$lang['Categories authorized thanks to group associations'] = 'Kategorie schváleny díky skupinovým spojením';
+$lang['Albums 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['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';
@@ -126,17 +125,17 @@ $lang['New tag'] = 'Nové klíčové slovo';
 $lang['Number of comments per page'] = 'Počet komentářů na stránce';
 $lang['Number of rates'] = 'Počet hodnocení';
 $lang['Number of thumbnails to create'] = 'Počet náhledů k vytvoření';
-$lang['Only private categories are listed'] = 'Jsou zobrazeny pouze soukromé kategorie';
+$lang['Only private albums are listed'] = 'Jsou zobrazeny pouze soukromé kategorie';
 $lang['Operating system'] = 'Operační systém';
 $lang['Options'] = 'Nastavení';
-$lang['Other private categories'] = 'Další soukromé kategorie';
+$lang['Other private albums'] = 'Další soukromé kategorie';
 $lang['Page banner'] = 'Banner stránky';
 $lang['Parent album'] = 'Rodičovská kategorie';
 $lang['Path'] = 'Cesta';
 $lang['Permalink'] = 'Pernamentní spojení';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'Pernamentní spojení %s bylo předtím použito kategorií %s. Nejprve smažte z historie spojení.';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'Pernamentní spojení %s bylo předtím použito kategorií %s. Nejprve smažte z historie spojení.';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'Pernamentní spojení musí být složeno ze znaků a-z, A-Z, 0-9, "-", "_" nebo "/". Nelze použít pouze číslo nebo číslo následované "-"';
-$lang['Permalink %s is already used by category %s'] = 'Pernamentní spojení je již využíváno kategorií %s';
+$lang['Permalink %s is already used by album %s'] = 'Pernamentní spojení je již využíváno kategorií %s';
 $lang['Permalink history'] = 'Historie pernamentního spojení';
 $lang['Permalinks'] = 'Pernamentní spojení';
 $lang['Permission denied'] = 'Přístup zamítnut';
@@ -154,7 +153,7 @@ $lang['Rating'] = 'Hodnocení';
 $lang['Reject All'] = 'Zamítnout všechny';
 $lang['Reject'] = 'Zamítnout';
 $lang['Representant'] = 'Reprezentant';
-$lang['Representation of categories'] = 'Reprezentantativní fotografie pro kategorii';
+$lang['Representation of albums'] = 'Reprezentantativní fotografie pro kategorii';
 $lang['Representative'] = 'Reprezentativní fotografie';
 $lang['Represents'] = 'Reprezentativní fotografie';
 $lang['Save order'] = 'Uložit pořadí';
@@ -187,7 +186,7 @@ $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 album in its own sub album'] = 'Nelze přesunout kategorii do její vlastní podkategorie';
+$lang['You cannot move an 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';
@@ -195,18 +194,17 @@ $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['Authorize users to add comments on selected albums'] = 'Povolit uživatelům komentovat vybrané kategorie';
 $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';
 $lang['Find a new representant by random'] = 'Najít reprezentativní obrázek pomocí náhodného výběru';
 $lang['Public / Private'] = 'Veřejná / Soukromá';
-$lang['Manage authorizations for selected categories'] = 'Nastavit oprávnění pro vybrané kategorie';
-$lang['Select uploadable categories'] = 'Zvolit kategorie s možností nahrávání obsahu';
+$lang['Manage authorizations for selected albums'] = 'Nastavit oprávnění pro vybrané kategorie';
+$lang['Select uploadable albums'] = 'Zvolit kategorie s možností nahrávání obsahu';
 $lang['Virtual album added'] = 'Virtuální kategorie přidána';
 $lang['Virtual album deleted'] = 'Virtuální kategorie smazána';
-$lang['Category'] = 'Kategorie';
 $lang['Access type'] = 'Druh přístupu';
 $lang['Comments'] = 'Komentáře uživatelů';
 $lang['Information data registered in database'] = 'Data byla uložena do databáze';
@@ -361,10 +359,10 @@ $lang['synchronize metadata'] = 'Synchronizovat metadata';
 $lang['target'] = 'Cíl';
 $lang['Thumbnail'] = 'Náhled';
 $lang['title'] = 'Název';
-$lang['Categories management'] = 'Správa kategorií';
+$lang['Album list management'] = 'Správa kategorií';
 $lang['Piwigo configuration'] = 'Nastavení aplikace Piwigo';
 $lang['Piwigo administration'] = 'Administrace aplikace Piwigo';
-$lang['Edit a category'] = 'Editovat kategorii';
+$lang['Edit album'] = 'Editovat kategorii';
 $lang['Group management'] = 'Správa skupin';
 $lang['User list'] = 'Seznam uživatelů';
 $lang['Modify informations about a picture'] = 'Upravit informace o fotografii';
@@ -395,9 +393,9 @@ $lang['unset'] = 'Nenastavovat';
 $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';
+$lang['reduce to single existing albums'] = 'Převést do jediné existující kategorie';
 $lang['Choose an option'] = 'Zvolit nastavení';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = 'Zobrazit veškeré informace informací (přidané a odstraněné kategorie a položky)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = 'Zobrazit veškeré informace informací (přidané a odstraněné kategorie a položky)';
 $lang['Piwigo version differs on the remote site'] = 'Verze Piwigo na vzdálené stránce není stejná jako místní';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'Verze souboru create_listing_file.php na vzdálené stránce musí být stejná jako verze místního souboru';
 $lang['listing.xml file was not found'] = 'Soubor listing.xml nebyl nalezen';
@@ -409,12 +407,12 @@ $lang['File/directory read error'] = 'Chyba při čtení souboru/adresáře';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'Soubor nebo adresář není přístupný nebo neexistuje';
 $lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'typ souboru vyžaduje náhled. Náhled musí být umístěn v podadresáři "thumbnail" v adresáři s kategorií. Název souboru náhledu musí začínat nastavenou předponou a přípona musí korespondovat s následujícím seznamem :';
 $lang['missing thumbnail'] = 'žádný náhled';
-$lang['categories deleted in the database'] = 'kategorií odstraněno z databáze';
+$lang['albums deleted in the database'] = 'kategorií odstraněno z databáze';
 $lang['elements deleted in the database'] = 'položek odstraněno z databáze';
 $lang['images candidates for metadata synchronization'] = 'fotografií pro synchronizaci metadat';
 $lang['elements informations synchronized with files metadata'] = 'informace synchronizované z metadat souborů';
 $lang['errors during synchronization'] = 'chyb během synchronizace';
-$lang['categories added in the database'] = 'kategorií přidáno do databáze';
+$lang['albums added in the database'] = 'kategorií přidáno do databáze';
 $lang['elements added in the database'] = 'položek přidáno do databáze';
 $lang['elements updated in the database'] = 'položek aktualizováno v databázi';
 $lang['Search for new images in the directories'] = 'Hledat nové obrázky v kategoriích';
@@ -446,7 +444,7 @@ $lang['Toggle \'default group\' property'] = 'Přepnout vlastnost \'základní s
 $lang['Advanced features'] = 'Rozšířené vlastnosti';
 $lang['Not linked elements'] = 'Nepřipojené položky';
 $lang['Specials'] = 'Ostatní';
-$lang['Files with same name in more than one physical category'] = 'Soubory se stejným názvem ve více než jedné fyzické kategorii';
+$lang['Files with same name in more than one physical album'] = 'Soubory se stejným názvem ve více než jedné fyzické kategorii';
 $lang['Overall'] = 'Celkově';
 $lang['Year'] = 'Rok';
 $lang['Month'] = 'Měsíc';
@@ -592,7 +590,7 @@ $lang['Templates configuration has been recorded.'] = 'Nastavení šablon bylo u
 $lang['All optimizations have been successfully completed.'] = 'Všechny změny byly úspěšně dokončeny.';
 $lang['Optimizations have been completed with some errors.'] = 'Změny byly dokončeny s několika chybami.';
 $lang['Modify information'] = 'Upravit informace';
-$lang['edit category informations'] = 'upravit informace o kategorii';
+$lang['edit album'] = 'upravit informace o kategorii';
 $lang['nothing'] = 'prázdné';
 $lang['overrides existing values with empty ones'] = 'nahradit stávající hodnoty prázdnými';
 $lang['manage image ranks'] = 'spravovat hodnocení fotografií';
@@ -613,18 +611,18 @@ $lang['Number of downloads'] = 'Počet stažení';
 
 // --------- Starting below: New or revised $lang ---- from Colibri
 $lang['Upload Photos'] = 'Nahrát fotografie';
-$lang['Drop into category'] = 'Zpět do kategorie';
+$lang['Drop into album'] = 'Zpět do kategorie';
 $lang['+ Add an upload box'] = '+ Přidat pole';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Vytvořte "%s" adresáře v kořenovém adresáři instalace Piwigo';
 $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['existing album'] = 'stávající kategorie';
+$lang['create a new album'] = 'Založit novou Kategorii';
 $lang['Album name'] = 'Název kategorie';
-$lang['Category "%s" has been added'] = 'Kategorie "%s" přidána';
+$lang['Album "%s" has been added'] = 'Kategorie "%s" přidána';
 $lang['Uploaded Photos'] = 'Nahrát fotografie';
 $lang['%d photos uploaded'] = '%d fotografií nahráno';
 $lang['Privacy level set to "%s"'] = 'Uroveň soukromí údajú nastaven na "%s"';
-$lang['Category "%s" now contains %d photos'] = 'Kategorie "%s" nyní obsahuje %d fotografií';
+$lang['Album "%s" now contains %d photos'] = 'Kategorie "%s" nyní obsahuje %d fotografií';
 $lang['Manage this set of %d photos'] = 'Spravovat tento soubor %d fotografií';
 $lang['Select files'] = 'Výběr souborů';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG soubory nebo ZIP archivy s JPEG soubory prosím.';
@@ -682,8 +680,6 @@ $lang['Your configuration settings are saved'] = 'Vaše nastavení bylo uloženo
 $lang['Active Themes'] = 'Aktivní témata';
 $lang['Add write access to the "%s" directory'] = 'nastavte přístup pro zápis do adresáře "%s"';
 $lang['Administration Home'] = 'Úvodní stránka administrace';
-$lang['Categories ordered alphanumerically'] = 'Kategorie seřazeny podle abecedy';
-$lang['Categories ordered alphanumerically reverse'] = 'Kategorie seřazeny sestupně podle abecedy';
 $lang['Change Admin Colors'] = 'Změňte barvy administrace';
 $lang['Delete this theme'] = 'Zrušte toto téma';
 $lang['Directory does not exist'] = 'Adresář neexistuje';
diff --git a/language/cs_CZ/common.lang.php b/language/cs_CZ/common.lang.php
index 12f0af737..3ad70a91d 100644
--- a/language/cs_CZ/common.lang.php
+++ b/language/cs_CZ/common.lang.php
@@ -57,8 +57,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Alespoň jedno pravidlo
 $lang['At least one tag must match'] = 'Alespoň jedno klíčové slovo musí odpovídat';
 $lang['Author'] = 'Autor';
 $lang['Average rate'] = 'Průměrné hodnocení';
-$lang['Categories'] = 'Kategorie';
-$lang['Category'] = 'Kategorie';
+$lang['Albums'] = 'Kategorie';
+$lang['Album'] = 'Kategorie';
 $lang['Close this window'] = 'Zavřít okno';
 $lang['Complete RSS feed (images, comments)'] = 'Kompletní RSS vlákno (fotografie, komentáře)';
 $lang['Confirm Password'] = 'Potvrdit heslo';
diff --git a/language/da_DK/admin.lang.php b/language/da_DK/admin.lang.php
index 837de931f..25d50e899 100644
--- a/language/da_DK/admin.lang.php
+++ b/language/da_DK/admin.lang.php
@@ -61,11 +61,10 @@ $lang['Add']     =     'Tilføj';
 $lang['Allow user registration']     =     'Tillad bruger registrering';
 $lang['Apply to sub-albums']     =     'Anvend på underkategorier';
 $lang['Associated']     =     'Associeret';
-$lang['Association to categories']     =     'Tilknytninger til kategorier';
 $lang['Batch management']     =     'Batch forvaltning';
 $lang['Caddie management']     =     'Caddie forvaltning';
 $lang['Caddie']     =     'Caddie';
-$lang['Categories authorized thanks to group associations']     =     'Kategorier tilladelse takket være gruppe tilknytninger';
+$lang['Albums 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['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.';
@@ -125,17 +124,17 @@ $lang['New tag']     =     'Nyt tag';
 $lang['Number of comments per page']     =     'Antal kommentarer pr side';
 $lang['Number of rates']     =     'Antal af karakterer';
 $lang['Number of thumbnails to create']     =     'Antallet af miniaturebillederne der skal dannes';
-$lang['Only private categories are listed']     =     'Kun private kategorier er opført';
+$lang['Only private albums are listed']     =     'Kun private kategorier er opført';
 $lang['Operating system']     =     'Operativsystem';
 $lang['Options']     =     'Muligheder';
-$lang['Other private categories']     =     'Andre private kategorier';
+$lang['Other private albums']     =     'Andre private kategorier';
 $lang['Page banner']     =     'Side banner';
 $lang['Parent album']     =     'Overordnet Kategori';
 $lang['Path']     =     'Path';
 $lang['Permalink']     =     'Permalink';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first']     =     'Permalink% s er tidligere blevet brugt af Kategori% s Slet det fra permalinks historie første';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first']     =     'Permalink% s er tidligere blevet brugt af Kategori% s Slet det fra permalinks historie første';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"']  =     'Det permalink navn skal bestå af az, AZ, 0-9, \' - \', \'_ \'eller \' / \'. Det må ikke være tal eller begynde med et tal efterfulgt af \'- \'';
-$lang['Permalink %s is already used by category %s']     =     'Permalink% s bruges allerede af Kategori% s';
+$lang['Permalink %s is already used by album %s']     =     'Permalink% s bruges allerede af Kategori% s';
 $lang['Permalink history']     =     'Permalinks historie';
 $lang['Permalinks']     =     'Permalinks';
 $lang['Permission denied']     =     'Nægtet Tilladelse';
@@ -153,7 +152,7 @@ $lang['Rating']     =     'Rating';
 $lang['Reject All']     =     'Afvis alle';
 $lang['Reject']     =     'Afvis';
 $lang['Representant']     =     'Representant';
-$lang['Representation of categories']     =     'Kategorier repræsentation';
+$lang['Representation of albums']     =     'Kategorier repræsentation';
 $lang['Representative']     =     'Repræsentant';
 $lang['Represents']     =     'Repræsenterer';
 $lang['Save order']     =     'Gem orden';
@@ -186,7 +185,7 @@ $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 album in its own sub album']     =     'Du kan ikke flytte en Kategori i dets eget under-kategori';
+$lang['You cannot move an 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';
@@ -194,18 +193,17 @@ $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['Authorize users to add comments on selected albums']     =     'Godkendelse af brugere at tilføje kommentarer på udvalgte kategorier';
 $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';
 $lang['Find a new representant by random']     =     'Find en ny tilfældig representant';
 $lang['Public / Private']     =     'Offentlige / Private';
-$lang['Manage authorizations for selected categories']     =     'Administrer tilladelser for udvalgte kategorier';
-$lang['Select uploadable categories']     =     'Vælg uploadable kategorier';
+$lang['Manage authorizations for selected albums']     =     'Administrer tilladelser for udvalgte kategorier';
+$lang['Select uploadable albums']     =     'Vælg uploadable kategorier';
 $lang['Virtual album added']     =     'Virtuel Kategori tilføjet';
 $lang['Virtual album deleted']     =     'Virtuel Kategori slettet';
-$lang['Category']     =     'Kategori';
 $lang['Access type']     =     'Adgang type';
 $lang['Comments']     =     'Kommentarer';
 $lang['Information data registered in database']     =     'Oplysninger, der er registreret i databasen';
@@ -362,10 +360,10 @@ $lang['synchronize metadata']     =     'Synkronisere metadata';
 $lang['target']     =     'Target';
 $lang['Thumbnail']     =     'Thumbnail';
 $lang['title']     =     'Tittel';
-$lang['Categories management']     =     'Kategorier forvaltning';
+$lang['Album list management']     =     'Kategorier forvaltning';
 $lang['Piwigo configuration']     =     'Piwigo konfiguration';
 $lang['Piwigo administration']     =     'Piwigo administration';
-$lang['Edit a category']     =     'Edit en Kategori';
+$lang['Edit album']     =     'Edit en Kategori';
 $lang['Group management']     =     'Grupper forvaltning';
 $lang['User list']     =     'Brugere liste';
 $lang['Modify informations about a picture']     =     'Rediger billede information';
@@ -396,9 +394,9 @@ $lang['unset']     =     'Unset';
 $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';
+$lang['reduce to single existing albums']     =     'Reduceres til én eksisterende kategorier';
 $lang['Choose an option']     =     'Vælg en option';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)']     =     'Display flest mulige oplysninger (tilføjet kategorier og elementer, slettede kategorier og elementer)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)']     =     'Display flest mulige oplysninger (tilføjet kategorier og elementer, slettede kategorier og elementer)';
 $lang['Piwigo version differs on the remote site']     =     'Piwigo version adskiller sig på remote siden';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same']     =     'Versioner af create_listing_file.php på remote siden og Piwigo skal være den samme';
 $lang['listing.xml file was not found']     =     'Listing.xml fil ikke fundet';
@@ -410,12 +408,12 @@ $lang['File/directory read error']     =     'File / directory læse fejl';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)']     =     'Fil eller mappe ikke kan få adgang (enten det eksisterer ikke eller adgang nægtes)';
 $lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :']     =     'Et billede filetype kræver en miniature. Miniaturen skal være til stede i sub-bibliotek \' miniature \'af Kategori mappe. Thumbnail Filnavnet skal starte med den konfigurerede thumbnail præfiks og udvidelsen skal være blandt de følgende liste:';
 $lang['missing thumbnail']     =     'Manglende thumbnail';
-$lang['categories deleted in the database']     =     'Kategorier slettet i databasen';
+$lang['albums deleted in the database']     =     'Kategorier slettet i databasen';
 $lang['elements deleted in the database']     =     'Elementer slettet i databasen';
 $lang['images candidates for metadata synchronization']     =     'Billeder kandidater til metadata synkronisering';
 $lang['elements informations synchronized with files metadata']     =     'Elementer informationer synkroniseret med filer metadata';
 $lang['errors during synchronization']     =     'Fejl under synkroniseringen';
-$lang['categories added in the database']     =     'Kategorier tilføjet i databasen';
+$lang['albums added in the database']     =     'Kategorier tilføjet i databasen';
 $lang['elements added in the database']     =     'Elementer tilføjet i databasen';
 $lang['elements updated in the database']     =     'Elementer opdateret i databasen';
 $lang['Search for new images in the directories']     =     'Søg efter nye billeder i mapper';
@@ -447,7 +445,7 @@ $lang['Toggle \'default group\' property']     =     'Reverse \'default Gruppe\'
 $lang['Advanced features']     =     'Avancerede funktioner';
 $lang['Not linked elements']     =     'Ikke linkede elementer';
 $lang['Specials']     =     'Special';
-$lang['Files with same name in more than one physical category']     =     'Identiske filer navne i mere end én Fysisk Kategori';
+$lang['Files with same name in more than one physical album']     =     'Identiske filer navne i mere end én Fysisk Kategori';
 $lang['Overall']     =     'I alt';
 $lang['Year']     =     'År';
 $lang['Month']     =     'Måned';
@@ -592,7 +590,7 @@ $lang['Templates configuration has been recorded.']     =     'Skabeloner konfig
 $lang['All optimizations have been successfully completed.']     =     'Alle optimeringer er blevet afsluttet med succes.';
 $lang['Optimizations have been completed with some errors.']     =     'Optimeringer er afsluttet med nogle fejl.';
 $lang['Modify information']     =     'Rediger oplysninger';
-$lang['edit category informations']     =     'Redigere denne Kategori oplysninger';
+$lang['edit album']     =     'Redigere denne Kategori oplysninger';
 $lang['nothing']     =     'Intet';
 $lang['overrides existing values with empty ones']     =     'Tilsidesætter eksisterende værdier med tomme';
 $lang['manage image ranks']     =     'Styre image ranking';
@@ -637,19 +635,19 @@ $lang['Forbid this theme to users']     =     'Forbyd dette tema til brugere';
 $lang['Set as default theme for unregistered and new users']     =     'Sæt som standard tema for uregistrerede og nye brugere';
 $lang['unknown']     =     'Ukendt';
 $lang['Upload Photos']     =     'Upload billeder ';
-$lang['Drop into category']     =     'Drop i Kategori ';
+$lang['Drop into album']     =     'Drop i Kategori ';
 $lang['+ Add an upload box']     =     '+ Tilføj en upload boks';
 $lang['Upload']     =     'Upload';
 $lang['Create the "%s" directory at the root of your Piwigo installation']     =     'Opret \'%s\' bibliotek i roden af din Piwigo anlæg';
 $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['existing album']     =     'Eksisterende Kategori ';
+$lang['create a new album']     =     'Oprette et nyt Kategori ';
 $lang['Album name']     =     'Kategori navn ';
-$lang['Category "%s" has been added']     =     'Kategori \'%s\' er blevet tilføjet ';
+$lang['Album "%s" has been added']     =     'Kategori \'%s\' er blevet tilføjet ';
 $lang['Uploaded Photos']     =     'Uploadede fotos ';
 $lang['%d photos uploaded']     =     ' %d uploaded billeder';
 $lang['Privacy level set to "%s"']     =     'Privat niveau sat til \'%s\'';
-$lang['Category "%s" now contains %d photos']     = 'Kategori \'%s\'indeholder nu %d billeder ';
+$lang['Album "%s" now contains %d photos']     = 'Kategori \'%s\'indeholder nu %d billeder ';
 $lang['Manage this set of %d photos']     =     'Administrer dette sæt af %d billeder ';
 $lang['Select files']     =     'Vælg filer';
 $lang['JPEG files or ZIP archives with JPEG files inside please.']     =     'JPEG-filer eller ZIP arkiver med JPEG-filer inde tak. ';
diff --git a/language/da_DK/common.lang.php b/language/da_DK/common.lang.php
index ee5b557de..6559b15ab 100644
--- a/language/da_DK/common.lang.php
+++ b/language/da_DK/common.lang.php
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Mindst en af reglerne sk
 $lang['At least one tag must match'] = 'Mindst en tag skal passe';
 $lang['Author'] = 'Fotograf';
 $lang['Average rate'] = 'Gennemsnitlig karakter';
-$lang['Categories'] = 'kategorier';
-$lang['Category'] = 'kategori';
+$lang['Albums'] = 'kategorier';
+$lang['Album'] = 'kategori';
 $lang['Close this window'] = 'Luk dette vindue';
 $lang['Complete RSS feed (images, comments)'] = 'Komplet RSS feed (fotos, kommentarer)';
 $lang['Confirm Password'] = 'Bekræft Password';
diff --git a/language/de_DE/admin.lang.php b/language/de_DE/admin.lang.php
index bc5ce992c..ac7c8feff 100644
--- a/language/de_DE/admin.lang.php
+++ b/language/de_DE/admin.lang.php
@@ -63,7 +63,7 @@ $lang['Association to categories'] = 'Ist in folgende Alben verlinkt';
 $lang['Batch management'] = 'Stapelverarbeitung';
 $lang['Caddie management'] = 'Sammelkorb verwalten';
 $lang['Caddie'] = 'Sammelkorb';
-$lang['Categories authorized thanks to group associations'] = 'Für Kategorien freigeschaltet durch Gruppenzugehörigkeit';
+$lang['Albums authorized thanks to group associations'] = 'Für Kategorien freigeschaltet durch Gruppenzugehörigkeit';
 $lang['Album manual order was saved'] = 'Albenreihenfolge gespeichert';
 $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.';
@@ -123,17 +123,17 @@ $lang['New tag'] = 'Neuer Tag';
 $lang['Number of comments per page'] = 'Anzahl von Kommentaren pro Seite';
 $lang['Number of rates'] = 'Anzahl von Bewertungen';
 $lang['Number of thumbnails to create'] = 'Anzahl von zu erstellenden Vorschaubildern';
-$lang['Only private categories are listed'] = 'Nur private Kategorien aufgeführt';
+$lang['Only private albums are listed'] = 'Nur private Kategorien aufgeführt';
 $lang['Operating system'] = 'Betriebssystem';
 $lang['Options'] = 'Optionen';
-$lang['Other private categories'] = 'Andere private Kategorien';
+$lang['Other private albums'] = 'Andere private Kategorien';
 $lang['Page banner'] = 'Seitenbanner';
 $lang['Parent album'] = 'übergeordnetes Album';
 $lang['Path'] = 'Pfad';
 $lang['Permalink'] = 'Permalink';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'Permalink %s wurde vorher Kategorie %s zugewiesen. Lösche ihn zuerst aus der History';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'Permalink %s wurde vorher Kategorie %s zugewiesen. Lösche ihn zuerst aus der History';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'Ein Permalink darf nur aus folgenden Zeichen bestehen: a-z, A-Z, 0-9, "-" or "_". Er darf nicht nur aus Zahlen bestehen oder mit einer Zahl beginnen mit einem darauffolgenden "-"';
-$lang['Permalink %s is already used by category %s'] = 'Permalink %s wird zur Zeit von Kategorie %s benutzt';
+$lang['Permalink %s is already used by album %s'] = 'Permalink %s wird zur Zeit von Kategorie %s benutzt';
 $lang['Permalink history'] = 'Permalink-Historie';
 $lang['Permalinks'] = 'Permalinks';
 $lang['Permission denied'] = 'Zugriff verweigern';
@@ -151,7 +151,7 @@ $lang['Rating'] = 'Bewertungen';
 $lang['Reject All'] = 'alle abweisen';
 $lang['Reject'] = 'abweisen';
 $lang['Representant'] = 'Vorschaubild';
-$lang['Representation of categories'] = 'Galerievorschaubild';
+$lang['Representation of albums'] = 'Galerievorschaubild';
 $lang['Representative'] = 'Vorschaubild';
 $lang['Represents'] = 'Ist Vorschaubild für diese Kategorien';
 $lang['Save order'] = 'Reihenfolge speichern';
@@ -184,7 +184,7 @@ $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 album in its own sub album'] = 'Sie können eine Kategorie nicht in ihre eigene Unterkategorie verschieben.';
+$lang['You cannot move an 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';
@@ -192,18 +192,17 @@ $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['Authorize users to add comments on selected albums'] = 'Benutzern erlauben, in ausgewählten Kategorien Kommentare zu schreiben';
 $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';
 $lang['Find a new representant by random'] = 'Bestimme ein neues zufälliges Vorschaubild';
 $lang['Public / Private'] = 'Öffentlich / Privat';
-$lang['Manage authorizations for selected categories'] = 'Berechtigungen für ausgewählte Kategorien verwalten';
-$lang['Select uploadable categories'] = 'gebe Kategorien für den Upload frei';
+$lang['Manage authorizations for selected albums'] = 'Berechtigungen für ausgewählte Kategorien verwalten';
+$lang['Select uploadable albums'] = 'gebe Kategorien für den Upload frei';
 $lang['Virtual album added'] = 'Virtuelles Album hinzugefügt';
 $lang['Virtual album deleted'] = 'Virtuelles Album gelöscht';
-$lang['Category'] = 'Kategorie';
 $lang['Access type'] = 'Zugangsart';
 $lang['Comments'] = 'Benutzerkommentare';
 $lang['Information data registered in database'] = 'Änderungen wurden gespeichert';
@@ -355,10 +354,10 @@ $lang['synchronize metadata'] = 'Synchronisieren von Meta-Daten';
 $lang['target'] = 'Ziel';
 $lang['Thumbnail'] = 'Thumbnail';
 $lang['title'] = 'Titel';
-$lang['Categories management'] = 'Verwalten von Kategorien';
+$lang['Album list management'] = 'Verwalten von Kategorien';
 $lang['Piwigo configuration'] = 'Konfiguration von Piwigo';
 $lang['Piwigo administration'] = 'Verwaltung von Piwigo';
-$lang['Edit a category'] = 'Bearbeiten einer Kategorie';
+$lang['Edit album'] = 'Bearbeiten einer Kategorie';
 $lang['Group management'] = 'Verwalten von Gruppen';
 $lang['User list'] = 'Liste der Benutzer';
 $lang['Modify informations about a picture'] = 'ändern der Informationen eines Bildes';
@@ -389,9 +388,9 @@ $lang['unset'] = 'Lösche Einstellung';
 $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';
+$lang['reduce to single existing albums'] = 'Auf einzelne bestehende Kategorien reduzieren';
 $lang['Choose an option'] = 'Eine Option auswählen';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = 'Sämtliche Informationen anzeigen (hinzugefügte Kategorien und Elemente, gelöschte Kategorien und Elemente)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = 'Sämtliche Informationen anzeigen (hinzugefügte Kategorien und Elemente, gelöschte Kategorien und Elemente)';
 $lang['Piwigo version differs on the remote site'] = 'PhpWebGallery version unterscheidet sich von der Remote-Seite';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'Die Version von create_listing_file.php auf der Remote-Seite und PhpWebGallery muss die gleiche sein';
 $lang['listing.xml file was not found'] = 'listing.xml Datei nicht gefunden';
@@ -403,12 +402,12 @@ $lang['File/directory read error'] = 'Datei/Ordner Lesefehler';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'Auf diese Datei/Ordner kann nicht zugegriffen werden (Entweder es existiert nicht oder der Zugriff wurde verwehrt)';
 $lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'Ein Bild braucht ein Vorschaubild. Das Vorschaubild muß sich im Unterverzeichnis "thumbnail" des Kategorieverzechnisses befinden. Der Dateiname des Vorschaubildes muß mit dem eingestellten Thumbnail-Vorzeichen beginnen und der Dateityp einem der folgenden entsprechen :';
 $lang['missing thumbnail'] = 'Fehlendes Thumbnail';
-$lang['categories deleted in the database'] = 'Kategorien in der Datenbank gelöscht';
+$lang['albums deleted in the database'] = 'Kategorien in der Datenbank gelöscht';
 $lang['elements deleted in the database'] = 'Elemente in der Datenbank gelöscht';
 $lang['images candidates for metadata synchronization'] = 'Elemente , deren Metadaten vorhanden sind';
 $lang['elements informations synchronized with files metadata'] = 'Elemente mit der Meta-Datenbank syncronisiert';
 $lang['errors during synchronization'] = 'Fehler während der Synchronisation';
-$lang['categories added in the database'] = 'Kategorien in der Datenbank hinzugefügt';
+$lang['albums added in the database'] = 'Kategorien in der Datenbank hinzugefügt';
 $lang['elements added in the database'] = 'Elemente in der Datenbank hinzugefügt';
 $lang['elements updated in the database'] = 'Elemente in der Datenbank aktualisiert';
 $lang['Search for new images in the directories'] = 'Suche nach neuen Elementen in den vorhandenen Ordnern';
@@ -440,7 +439,7 @@ $lang['Toggle \'default group\' property'] = 'Setze die Einstellungen der Gruppe
 $lang['Advanced features'] = 'Erweiterte Einstellungen';
 $lang['Not linked elements'] = 'Nicht verlinkte Elemente';
 $lang['Specials'] = 'Erweiterte Verwaltung';
-$lang['Files with same name in more than one physical category'] = 'Finde Dateien mit der gleiche Beschreibung';
+$lang['Files with same name in more than one physical album'] = 'Finde Dateien mit der gleiche Beschreibung';
 
 $lang['Overall'] = 'Gesamt';
 $lang['Year'] = 'Jahr';
@@ -589,7 +588,7 @@ $lang['Templates configuration has been recorded.'] = 'Die Konfiguration der Tem
 $lang['All optimizations have been successfully completed.'] = 'Alle Optimierungen wurden erfolgreich abgeschlossen.';
 $lang['Optimizations have been completed with some errors.'] = 'Einige Optimierungen endeten mit Fehlern.';
 $lang['Modify information'] = 'Informationen ändern';
-$lang['edit category informations'] = 'Kategorieeigenschaften und -beschreibung bearbeiten';
+$lang['edit album'] = 'Kategorieeigenschaften und -beschreibung bearbeiten';
 $lang['nothing'] = 'nichts';
 $lang['overrides existing values with empty ones'] = 'Löscht alle Werte in der Datenbank !!  (filesize, width, height, high_filesize, date_creation, keywords, date_creation, author, name, comment)';
 $lang['manage image ranks'] = 'Verwaltung der Reihenfolge der Bilder';
@@ -639,18 +638,18 @@ $lang['Forbid this theme to users'] = 'Verbieten Sie dieses Thema den Benutzern'
 $lang['Set as default theme for unregistered and new users'] = 'Setzte als Standartthema für unregistrierte und neue Benutzer';
 $lang['unknown'] = 'unbekannt';
 $lang['Upload Photos'] = 'Lade Fotos hoch';
-$lang['Drop into category'] = 'Ziehe es in die Kategorie';
+$lang['Drop into album'] = 'Ziehe es in die Kategorie';
 $lang['+ Add an upload box'] = '+ eine weitere Uploadbox';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Erstelle den  "%s" Ordner im Hauptordner (root) deiner Piwigoinstallation';
 $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['existing album'] = 'existierende Kategorie';
+$lang['create a new album'] = 'erstelle eine neue Kategorie';
 $lang['Album name'] = 'Kategoriename';
-$lang['Category "%s" has been added'] = 'Kategorie "%s" wurde hinzugefügt';
+$lang['Album "%s" has been added'] = 'Kategorie "%s" wurde hinzugefügt';
 $lang['Uploaded Photos'] = 'Lade Fotos hoch';
 $lang['%d photos uploaded'] = '%d Fotos hochgeladen';
 $lang['Privacy level set to "%s"'] = 'Privacy level gesetzt auf "%s"';
-$lang['Category "%s" now contains %d photos'] = 'Kategorie "%s" enthält nun %d Fotos';
+$lang['Album "%s" now contains %d photos'] = 'Kategorie "%s" enthält nun %d Fotos';
 $lang['Manage this set of %d photos'] = 'Verwalte dieses Set von %d Fotos';
 $lang['Select files'] = 'Wähle Dateien aus';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG Dateien oder ZIP Archive, die JPEG Dateien enthalten bitte.';
diff --git a/language/de_DE/common.lang.php b/language/de_DE/common.lang.php
index 56189000f..2eee83a08 100644
--- a/language/de_DE/common.lang.php
+++ b/language/de_DE/common.lang.php
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Mindestens eine aufgelis
 $lang['At least one tag must match'] = 'Mindestens ein Tag muss übereinstimmen';
 $lang['Author'] = 'Autor';
 $lang['Average rate'] = 'Durchschnittliche Bewertung';
-$lang['Categories'] = 'Kategorien';
-$lang['Category'] = 'Kategorie';
+$lang['Albums'] = 'Kategorien';
+$lang['Album'] = 'Kategorie';
 $lang['Close this window'] = 'Dieses Fenster schließen';
 $lang['Complete RSS feed (images, comments)'] = 'RSS-Feeds komplett (Bilder, Kommentare)';
 $lang['Confirm Password'] = 'Neues Passwort bestätigen';
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index d0e0de64f..a94e7da17 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -61,11 +61,10 @@ $lang['Add'] = "Add";
 $lang['Allow user registration'] = "Allow user registration";
 $lang['Apply to sub-albums'] = "Apply to sub-albums";
 $lang['Associated'] = "Associated";
-$lang['Association to categories'] = "Association to categories";
 $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['Albums authorized thanks to group associations'] = "Albums authorized thanks to group associations";
 $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.";
@@ -125,17 +124,17 @@ $lang['New tag'] = "New tag";
 $lang['Number of comments per page'] = "Number of comments per page";
 $lang['Number of rates'] = "Number of rates";
 $lang['Number of thumbnails to create'] = "Number of thumbnails to create";
-$lang['Only private categories are listed'] = "Only private categories are listed";
+$lang['Only private albums are listed'] = "Only private albums are listed";
 $lang['Operating system'] = "Operating system";
 $lang['Options'] = "Options";
-$lang['Other private categories'] = "Other private categories";
+$lang['Other private albums'] = "Other private albums";
 $lang['Page banner'] = "Page banner";
 $lang['Parent album'] = "Parent album";
 $lang['Path'] = "Path";
 $lang['Permalink'] = "Permalink";
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = "Permalink %s has previously been used by category %s. Delete it from the permalinks history first";
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = "Permalink %s has previously been used by album %s. Delete it from the permalinks history first";
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = "The permalink name must be composed of a-z, A-Z, 0-9, \"-\", \"_\" or \"/\". It must not be numeric or begin with a number followed by \"-\"";
-$lang['Permalink %s is already used by category %s'] = "Permalink %s is already used by category %s";
+$lang['Permalink %s is already used by album %s'] = "Permalink %s is already used by album %s";
 $lang['Permalink history'] = "Permalinks history";
 $lang['Permalinks'] = "Permalinks";
 $lang['Permission denied'] = "Permission denied";
@@ -153,7 +152,7 @@ $lang['Rating'] = "Rating";
 $lang['Reject All'] = "Reject All";
 $lang['Reject'] = "Reject";
 $lang['Representant'] = "Representant";
-$lang['Representation of categories'] = "Categories representation";
+$lang['Representation of albums'] = "Representation of albums";
 $lang['Representative'] = "Representative";
 $lang['Represents'] = "Represents";
 $lang['Save order'] = "Save order";
@@ -186,7 +185,7 @@ $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 album in its own sub album'] = "You cannot move a category into its own sub category";
+$lang['You cannot move an album in its own sub album'] = "You cannot move an album in its own sub album";
 $lang['You need to confirm deletion'] = "You must confirm deletion";
 $lang['add tags'] = "add tags";
 $lang['Adviser'] = "Adviser";
@@ -194,18 +193,17 @@ $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['Authorize users to add comments on selected albums'] = "Authorize users to add comments on selected albums";
 $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";
 $lang['Find a new representant by random'] = "Find a new random representant";
 $lang['Public / Private'] = "Public / Private";
-$lang['Manage authorizations for selected categories'] = "Manage authorizations for selected categories";
-$lang['Select uploadable categories'] = "Select uploadable categories";
+$lang['Manage authorizations for selected albums'] = "Manage authorizations for selected albums";
+$lang['Select uploadable albums'] = "Select uploadable albums";
 $lang['Virtual album added'] = "Virtual album added";
 $lang['Virtual album deleted'] = "Virtual album deleted";
-$lang['Category'] = "Category";
 $lang['Access type'] = "Access type";
 $lang['Comments'] = "Comments";
 $lang['Information data registered in database'] = "Information data registered in database";
@@ -361,10 +359,10 @@ $lang['synchronize metadata'] = "synchronize metadata";
 $lang['target'] = "target";
 $lang['Thumbnail'] = "Thumbnail";
 $lang['title'] = "title";
-$lang['Categories management'] = "Categories management";
+$lang['Album list management'] = "Album list management";
 $lang['Piwigo configuration'] = "Piwigo configuration";
 $lang['Piwigo administration'] = "Piwigo administration";
-$lang['Edit a category'] = "Edit a category";
+$lang['Edit album'] = "Edit album";
 $lang['Group management'] = "Groups management";
 $lang['User list'] = "Users list";
 $lang['Modify informations about a picture'] = "Modify picture information";
@@ -392,12 +390,12 @@ $lang['for this file format'] = "for this file format";
 $lang['unit mode'] = "single mode";
 $lang['Unlocked'] = "Unlocked";
 $lang['unset'] = "unset";
-$lang['Update albums informations'] = "Update categories information";
+$lang['Update albums informations'] = "Update albums information";
 $lang['Update images informations'] = "Update images information";
 $lang['Synchronize'] = "Synchronize";
-$lang['reduce to single existing categories'] = "reduce to single existing categories";
+$lang['reduce to single existing albums'] = "reduce to single existing albums";
 $lang['Choose an option'] = "Choose an option";
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = "display maximum information (added categories and elements, deleted categories and elements)";
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = "display maximum information (added albums and elements, deleted albums and elements)";
 $lang['Piwigo version differs on the remote site'] = "Piwigo version differs on the remote site";
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = "Versions of create_listing_file.php on the remote site and Piwigo must be the same";
 $lang['listing.xml file was not found'] = "listing.xml file not found";
@@ -409,12 +407,12 @@ $lang['File/directory read error'] = "File/directory read error";
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = "The file or directory cannot be accessed (either it does not exist or the access is denied)";
 $lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = "a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory \"thumbnail\" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :";
 $lang['missing thumbnail'] = "missing thumbnail";
-$lang['categories deleted in the database'] = "categories deleted in the database";
+$lang['albums deleted in the database'] = "albums deleted in the database";
 $lang['elements deleted in the database'] = "elements deleted in the database";
 $lang['images candidates for metadata synchronization'] = "images candidates for metadata synchronization";
 $lang['elements informations synchronized with files metadata'] = "elements informations synchronized with files metadata";
 $lang['errors during synchronization'] = "errors during synchronization";
-$lang['categories added in the database'] = "categories added in the database";
+$lang['albums added in the database'] = "albums added in the database";
 $lang['elements added in the database'] = "elements added in the database";
 $lang['elements updated in the database'] = "elements updated in the database";
 $lang['Search for new images in the directories'] = "Search for new images in the directories";
@@ -446,7 +444,7 @@ $lang['Toggle \'default group\' property'] = "Reverse 'default group' property";
 $lang['Advanced features'] = "Advanced features";
 $lang['Not linked elements'] = "Unlinked elements";
 $lang['Specials'] = "Specials";
-$lang['Files with same name in more than one physical category'] = "Identical files names in more than one physical category";
+$lang['Files with same name in more than one physical album'] = "Identical files names in more than one physical album";
 $lang['Overall'] = "Overview";
 $lang['Year'] = "Year";
 $lang['Month'] = "Month";
@@ -591,7 +589,7 @@ $lang['Templates configuration has been recorded.'] = "Templates configuration h
 $lang['All optimizations have been successfully completed.'] = "All optimizations have been successfully completed.";
 $lang['Optimizations have been completed with some errors.'] = "Optimizations have been completed with some errors.";
 $lang['Modify information'] = "Modify information";
-$lang['edit category informations'] = "edit this category information";
+$lang['edit album'] = "edit album";
 $lang['nothing'] = "nothing";
 $lang['overrides existing values with empty ones'] = "overrides existing values with empty ones";
 $lang['manage image ranks'] = "manage image ranks";
@@ -638,18 +636,18 @@ $lang['Set as default theme for unregistered and new users'] = "Set as default t
 $lang['unknown'] = 'unknown';
 
 $lang['Upload Photos'] = 'Upload Photos';
-$lang['Drop into category'] = 'Drop into category';
+$lang['Drop into album'] = 'Drop into album';
 $lang['+ Add an upload box'] = '+ Add an upload box';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = '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'] = '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['existing album'] = 'existing album';
+$lang['create a new album'] = 'create a new album';
 $lang['Album name'] = 'Album name';
-$lang['Category "%s" has been added'] = 'Category "%s" has been added';
+$lang['Album "%s" has been added'] = 'Album "%s" has been added';
 $lang['Uploaded Photos'] = 'Uploaded Photos';
 $lang['%d photos uploaded'] = '%d photos uploaded';
 $lang['Privacy level set to "%s"'] = 'Privacy level set to "%s"';
-$lang['Category "%s" now contains %d photos'] = 'Category "%s" now contains %d photos';
+$lang['Album "%s" now contains %d photos'] = 'Album "%s" now contains %d photos';
 $lang['Manage this set of %d photos'] = 'Manage this set of %d photos';
 $lang['Select files'] = 'Select files';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG files or ZIP archives with JPEG files inside please.';
@@ -766,5 +764,5 @@ $lang['Error on file "%s" : %s'] = 'Error on file "%s" : %s';
 $lang['Menu Management'] = 'Menus';
 $lang['automatic order'] = 'automatic order';
 $lang['manual order'] = 'manual order';
-$lang['Categories automatically sorted'] = 'Categories automatically sorted';
+$lang['Albums automatically sorted'] = 'Albums automatically sorted';
 ?>
diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index 9a6e7e34b..e356ed40d 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = "At least one listed crit
 $lang['At least one tag must match'] = "At least one tag must match";
 $lang['Author'] = "Author";
 $lang['Average rate'] = "Average rate";
-$lang['Categories'] = "Categories";
-$lang['Category'] = "Category";
+$lang['Albums'] = "Albums";
+$lang['Album'] = "Album";
 $lang['Close this window'] = "Close this window";
 $lang['Complete RSS feed (images, comments)'] = "Complete RSS feed (images, comments)";
 $lang['Confirm Password'] = "Confirm Password";
diff --git a/language/en_UK/help/cat_modify.html b/language/en_UK/help/cat_modify.html
index 392ad30a1..460e66661 100644
--- a/language/en_UK/help/cat_modify.html
+++ b/language/en_UK/help/cat_modify.html
@@ -1,4 +1,4 @@
-<h2>Edit a category</h2>
+<h2>Edit album</h2>
 
 <h3>Informations</h3>
 
@@ -85,7 +85,7 @@ it contains only sub-categories and no direct element (just as the root category
   <li><span class="pwgScreen">Administration, Categories, Properties,
   Representative</span>. See the help of this screen for details.</li>
 
-  <li><span class="pwgScreen">Edit a category</span> (the present screen).</li>
+  <li><span class="pwgScreen">Edit album</span> (the present screen).</li>
 
 </ul>
 
diff --git a/language/en_UK/help/cat_options.html b/language/en_UK/help/cat_options.html
index 4e1556fd7..682c2cce8 100644
--- a/language/en_UK/help/cat_options.html
+++ b/language/en_UK/help/cat_options.html
@@ -1,4 +1,4 @@
-<h2>Category options</h2>
+<h2>Album options</h2>
 
 <p>Options management for several categories at once.</p>
 
@@ -8,7 +8,7 @@
   <dd>Make categories uploadable for gallery visitors. The option ia available for physical local categories only.</dd>
 
   <dt>Comments</dt>
-  <dd>Authorize users to add comments on selected categories.
+  <dd>Authorize users to add comments on selected albums.
 Selects the categories which are commentable. 
 An image is commentable if it belongs to at least one category that is commentable.</dd>
 
diff --git a/language/en_UK/help/photos_add_ftp.html b/language/en_UK/help/photos_add_ftp.html
index a416c14c2..1fcafa364 100644
--- a/language/en_UK/help/photos_add_ftp.html
+++ b/language/en_UK/help/photos_add_ftp.html
@@ -13,7 +13,7 @@
   <li>Go to <span class="pwgScreen">Administration</span> and click on the big Synchronization button.</li>
 </ol>
 
-Congratulations! You have successfully created the first category of your photo gallery.
+Congratulations! You have successfully created the first album of your photo gallery.
 </fieldset>
 
 <fieldset>
@@ -23,7 +23,7 @@ Congratulations! You have successfully created the first category of your photo
 
   <li>
 
-    <p>Category directories are in the Piwigo directory
+    <p>Album directories are in the Piwigo directory
     "galleries". Here follows the directory tree of a very small gallery (but
     using many features):</p>
 
diff --git a/language/es_AR/common.lang.php b/language/es_AR/common.lang.php
index 69ef59c61..e4d5e0b84 100644
--- a/language/es_AR/common.lang.php
+++ b/language/es_AR/common.lang.php
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Uno de los criterios por
 $lang['At least one tag must match'] = 'Al menos un tag debe corresponder';
 $lang['Author'] = 'Autor';
 $lang['Average rate'] = 'Promedio';
-$lang['Categories'] = 'Categorías';
-$lang['Category'] = 'Categoría';
+$lang['Albums'] = 'Categorías';
+$lang['Album'] = 'Categoría';
 $lang['Close this window'] = 'Cierre esta ventana';
 $lang['Complete RSS feed (images, comments)'] = 'Flujo RSS completo (imágenes, comentarios)';
 $lang['Confirm Password'] = 'Confirme su contraseña';
diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php
index c1975926b..28d7f6ec3 100644
--- a/language/es_ES/admin.lang.php
+++ b/language/es_ES/admin.lang.php
@@ -59,11 +59,10 @@ $lang['Add'] = 'Añadir';
 $lang['Allow user registration'] = 'Permitir el registro de los usuarios';
 $lang['Apply to sub-albums'] = 'Aplicar a subcategorías';
 $lang['Associated'] = 'Asociada a';
-$lang['Association to categories'] = 'Asociación a las categorías';
 $lang['Batch management'] = 'Gestión por lote';
 $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['Albums 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['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.';
@@ -123,17 +122,17 @@ $lang['New tag'] = 'Nueva etiqueta';
 $lang['Number of comments per page'] = 'Número de comentarios por página';
 $lang['Number of rates'] = 'Número de notas';
 $lang['Number of thumbnails to create'] = 'Número de miniaturas que hay que crear';
-$lang['Only private categories are listed'] = 'Sólo las categorías particulares son puestas en una lista';
+$lang['Only private albums are listed'] = 'Sólo las categorías particulares son puestas en una lista';
 $lang['Operating system'] = 'Systema operativo';
 $lang['Options'] = 'Opciones';
-$lang['Other private categories'] = 'Otras categorías particulares';
+$lang['Other private albums'] = 'Otras categorías particulares';
 $lang['Page banner'] = 'Bandera de las páginas';
 $lang['Parent album'] = 'Categoría pariente';
 $lang['Path'] = 'Camino';
 $lang['Permalink'] = 'Lazo permanente';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'El lazo permanente %s ha sido utilizado anteriormente por la categoría %s. Por favor, bórrelo del histórico de los lazos permanentes';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'El lazo permanente %s ha sido utilizado anteriormente por la categoría %s. Por favor, bórrelo del histórico de los lazos permanentes';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'El lazo permanente debe contener sólo carácteres entre " - zA-Z0-9 ", "-" o "_". No debe ser numérico o comenzar con un número seguido por "-"';
-$lang['Permalink %s is already used by category %s'] = 'El lazo permanente %s es ya utilizado por la categoría %s';
+$lang['Permalink %s is already used by album %s'] = 'El lazo permanente %s es ya utilizado por la categoría %s';
 $lang['Permalink history'] = 'Histórico de los lazos permanentes';
 $lang['Permalinks'] = 'Lazos permanentes';
 $lang['Permission denied'] = 'Acceso prohibido';
@@ -151,7 +150,7 @@ $lang['Rating'] = 'Notación';
 $lang['Reject All'] = 'Rechazar todo';
 $lang['Reject'] = 'Rechazar';
 $lang['Representant'] = 'Representante';
-$lang['Representation of categories'] = 'Representación de las categorías';
+$lang['Representation of albums'] = 'Representación de las categorías';
 $lang['Representative'] = 'Representante';
 $lang['Represents'] = 'Representa';
 $lang['Save order'] = 'Salvaguardar la orden';
@@ -184,7 +183,7 @@ $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 album in its own sub album'] = 'Usted no puede desplazar una categoría en su propia subcategoría';
+$lang['You cannot move an 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';
@@ -192,18 +191,17 @@ $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['Authorize users to add comments on selected albums'] = 'Autorizar a los usuarios a añadir comentarios en las categorías seleccionadas';
 $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';
 $lang['Find a new representant by random'] = 'Encontrar a un nuevo representante al azar';
 $lang['Public / Private'] = 'Pública / Privada';
-$lang['Manage authorizations for selected categories'] = 'Administrar el tipo de acceso para las categorías seleccionadas';
-$lang['Select uploadable categories'] = 'Seleccionar las categorías autorizadas al añadido';
+$lang['Manage authorizations for selected albums'] = 'Administrar el tipo de acceso para las categorías seleccionadas';
+$lang['Select uploadable albums'] = 'Seleccionar las categorías autorizadas al añadido';
 $lang['Virtual album added'] = 'Categoría virtual añadida';
 $lang['Virtual album deleted'] = 'Categoría virtual suprimida';
-$lang['Category'] = 'Categoría';
 $lang['Access type'] = 'Tipo de acceso';
 $lang['Comments'] = 'Comentarios';
 $lang['Information data registered in database'] = 'Informaciones registradas en la base de datos';
@@ -357,10 +355,10 @@ $lang['synchronize metadata'] = 'Sincronizar los méta-datos';
 $lang['target'] = 'blanco';
 $lang['Thumbnail'] = 'miniatura';
 $lang['title'] = 'título';
-$lang['Categories management'] = 'Gestión de las categorías';
+$lang['Album list management'] = 'Gestión de las categorías';
 $lang['Piwigo configuration'] = 'Configuración de Piwigo';
 $lang['Piwigo administration'] = 'Administración de Piwigo';
-$lang['Edit a category'] = 'Modificar una categoría';
+$lang['Edit album'] = 'Modificar una categoría';
 $lang['Group management'] = 'Gestión de los grupos';
 $lang['User list'] = 'Lista usuarios';
 $lang['Modify informations about a picture'] = 'Modificar las informaciones de una imagen';
@@ -391,9 +389,9 @@ $lang['unset'] = 'Vaciar';
 $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';
+$lang['reduce to single existing albums'] = 'Únicamente tratar una categoría';
 $lang['Choose an option'] = 'Escoger una opción';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = 'Visualizar un máximo de informaciones (categorías añadidas, elementos añadidos, categorías y elementos suprimidos)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = 'Visualizar un máximo de informaciones (categorías añadidas, elementos añadidos, categorías y elementos suprimidos)';
 $lang['Piwigo version differs on the remote site'] = 'La versión Piwigo sobre el sitio distante es diferente';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'La versión de create_listing_file.php sobre el sitio distante y Piwigo deben ser los mismos';
 $lang['listing.xml file was not found'] = 'El fichero listing.xml es imposible de encontrar';
@@ -405,12 +403,12 @@ $lang['File/directory read error'] = 'Error de abertura fichero / repertorio';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'El fichero o el repertorio no puede ser accesible (o sea no existe, o sea el acceso esta negado)';
 $lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'Cada fichero con imágenes requiere una miniatura. La miniatura debe estar presente en el subdirectorio " thumbnail " del repertorio de la categoría. El nombre del fichero de la miniatura debe comenzar con parámetro de configuración "prefix_thumbnail" y la extensión del nombre del fichero debe estar entre la lista siguiente:';
 $lang['missing thumbnail'] = 'falta la miniatura ';
-$lang['categories deleted in the database'] = 'categorías suprimidas de la base de datos';
+$lang['albums deleted in the database'] = 'categorías suprimidas de la base de datos';
 $lang['elements deleted in the database'] = 'Elementos suprimidos de la base de datos';
 $lang['images candidates for metadata synchronization'] = 'Imágenes candidatas a la sincronización con los méta-datos';
 $lang['elements informations synchronized with files metadata'] = 'Informaciones de las imágenes sincronizadas con los méta-datos';
 $lang['errors during synchronization'] = 'errores sobrevenidos durante la sincronización';
-$lang['categories added in the database'] = 'categorías añadidas a la base de datos';
+$lang['albums added in the database'] = 'categorías añadidas a la base de datos';
 $lang['elements added in the database'] = 'elementos añadidos a la base de datos';
 $lang['elements updated in the database'] = 'elementos actualizados en la base de datos';
 $lang['Search for new images in the directories'] = 'Buscar las nuevas imágenes en los repertorios';
@@ -442,7 +440,7 @@ $lang['Toggle \'default group\' property'] = 'Invertir la propiedad \'grupo por
 $lang['Advanced features'] = 'Funciones avanzadas';
 $lang['Not linked elements'] = 'Elementos no atados';
 $lang['Specials'] = 'Especiales';
-$lang['Files with same name in more than one physical category'] = 'Ficheros que llevan el mismo nombre en varias categorías físicas';
+$lang['Files with same name in more than one physical album'] = 'Ficheros que llevan el mismo nombre en varias categorías físicas';
 $lang['Overall'] = 'Vista global';
 $lang['Year'] = 'Año';
 $lang['Month'] = 'Mes';
@@ -588,7 +586,7 @@ $lang['Templates configuration has been recorded.'] = 'La configuración del tem
 $lang['All optimizations have been successfully completed.'] = 'Todas las optimizaciones han sido realizadas con éxito.';
 $lang['Optimizations have been completed with some errors.'] = 'Ciertas optimizaciones se acabaron con errores.';
 $lang['Modify information'] = 'Modificar las informaciones';
-$lang['edit category informations'] = 'editar las informaciones de esta categoría';
+$lang['edit album'] = 'editar las informaciones de esta categoría';
 $lang['nothing'] = 'nada';
 $lang['overrides existing values with empty ones'] = 'Reemplazar los valores existentes con vacíos';
 $lang['manage image ranks'] = 'Administrar el orden de las imágenes';
@@ -637,18 +635,18 @@ $lang['Forbid this theme to users'] = 'Prohibirles este tema a los usuarios';
 $lang['Set as default theme for unregistered and new users'] = 'Tema por defecto para los invitados y los nuevos usuarios';
 $lang['unknown'] = 'desconocido';
 $lang['Upload Photos'] = 'Añada fotos';
-$lang['Drop into category'] = 'Poner en una categoría';
+$lang['Drop into album'] = 'Poner en una categoría';
 $lang['+ Add an upload box'] = '+ Añadir otra caja de transferencia';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Cree el repertorio "%s" en la raíz de su instalación Piwigo';
 $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['existing album'] = 'categoría existente';
+$lang['create a new album'] = 'crear una nueva 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['Album "%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';
 $lang['Privacy level set to "%s"'] = 'Nivel de confidencialidad "%s"';
-$lang['Category "%s" now contains %d photos'] = 'La categoría "%s"  contiene en lo sucesivo %d fotos';
+$lang['Album "%s" now contains %d photos'] = 'La categoría "%s"  contiene en lo sucesivo %d fotos';
 $lang['Manage this set of %d photos'] = 'Administrar este lote de %d fotos';
 $lang['Select files'] = 'Escoger ficheros';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'Ficheros JPEG o archivas ZIP que contiene ficheros JPEG por favor.';
@@ -675,8 +673,6 @@ $lang['Your configuration settings are saved'] = 'Sus parámetros de configuraci
 $lang['Active Themes'] = 'Temas activadas';
 $lang['Add write access to the "%s" directory'] = 'Añada el acceso en escritura para el repertorio';
 $lang['Administration Home'] = 'Acogida administración ';
-$lang['Categories ordered alphanumerically'] = 'Categorías escogidos por orden alfanumérico';
-$lang['Categories ordered alphanumerically reverse'] = 'Categorías escogidos por orden alfanumérico inverso';
 $lang['Change Admin Colors'] = 'Modificar los colores de la administración';
 $lang['Delete this theme'] = 'Suprimir este tema';
 $lang['Directory does not exist'] = 'El repertorio no existe';
diff --git a/language/es_ES/common.lang.php b/language/es_ES/common.lang.php
index 5f67a4456..d14565d50 100644
--- a/language/es_ES/common.lang.php
+++ b/language/es_ES/common.lang.php
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Debe elegir al menos una
 $lang['At least one tag must match'] = 'Debe coincidir al menos una de las etiquetas';
 $lang['Author'] = 'Autor';
 $lang['Average rate'] = 'Valoración promedio';
-$lang['Categories'] = 'Categorías';
-$lang['Category'] = 'Categoría';
+$lang['Albums'] = 'Categorías';
+$lang['Album'] = 'Categoría';
 $lang['Close this window'] = 'Cerrar la ventana';
 $lang['Complete RSS feed (images, comments)'] = 'Flujo RSS completo (imágenes, comentarios)';
 $lang['Confirm Password'] = 'Confirmar la contraseña';
diff --git a/language/fr_CA/admin.lang.php b/language/fr_CA/admin.lang.php
index 44c532530..b254327bf 100644
--- a/language/fr_CA/admin.lang.php
+++ b/language/fr_CA/admin.lang.php
@@ -61,11 +61,10 @@ $lang['Add'] = "Ajouter";
 $lang['Allow user registration'] = "Permettre l'enregistrement des utilisateurs";
 $lang['Apply to sub-albums'] = "Appliquer aux sous-catégories";
 $lang['Associated'] = "Associée à";
-$lang['Association to categories'] = "Association aux catégories";
 $lang['Batch management'] = "Gestion par lot";
 $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['Albums 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['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.";
@@ -126,17 +125,17 @@ $lang['New tag'] = "Nouveau mot clé";
 $lang['Number of comments per page'] = "Nombre de commentaires par page";
 $lang['Number of rates'] = "Nombre de notes";
 $lang['Number of thumbnails to create'] = "Nombre de miniatures à créer";
-$lang['Only private categories are listed'] = "Seules les catégories privées sont listées";
+$lang['Only private albums are listed'] = "Seules les catégories privées sont listées";
 $lang['Operating system'] = "Système d'exploitation";
 $lang['Options'] = "Options";
-$lang['Other private categories'] = "Autres catégories privées";
+$lang['Other private albums'] = "Autres catégories privées";
 $lang['Page banner'] = "Bannière des pages";
 $lang['Parent album'] = "Catégorie parente";
 $lang['Path'] = "Chemin";
 $lang['Permalink'] = "Lien permanent";
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = "Le lien permanent %s a été précédemment utilisé par la catégorie %s. Veuillez l'effacer de l'historique des liens permanents";
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = "Le lien permanent %s a été précédemment utilisé par la catégorie %s. Veuillez l'effacer de l'historique des liens permanents";
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = "Le lien permanent ne doit contenir des caractères que parmi \"a-zA-Z0-9\", \"-\", \"_\" ou \"/\". Il ne doit pas être numérique ou commencer par un nombre suivi par \"-\"";
-$lang['Permalink %s is already used by category %s'] = "Le lien permanent %s est déja utilisé par la catégorie %s";
+$lang['Permalink %s is already used by album %s'] = "Le lien permanent %s est déja utilisé par la catégorie %s";
 $lang['Permalink history'] = "Historique des liens permanents";
 $lang['Permalinks'] = "Liens permanents";
 $lang['Permission denied'] = "Accès interdit";
@@ -154,7 +153,7 @@ $lang['Rating'] = "Notation";
 $lang['Reject All'] = "Tout rejeter";
 $lang['Reject'] = "Rejeter";
 $lang['Representant'] = "Représentant";
-$lang['Representation of categories'] = "Représentation des catégories";
+$lang['Representation of albums'] = "Représentation des catégories";
 $lang['Representative'] = "Représentant";
 $lang['Represents'] = "Représente";
 $lang['Save order'] = "Sauvegarder l'ordre";
@@ -187,7 +186,7 @@ $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 album in its own sub album'] = "Vous ne pouvez pas déplacer une catégorie dans sa propre sous-catégorie";
+$lang['You cannot move an 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";
@@ -195,18 +194,17 @@ $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['Authorize users to add comments on selected albums'] = "Autoriser les utilisateurs à ajouter des commentaires dans les catégories sélectionnées";
 $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";
 $lang['Find a new representant by random'] = "Trouver un nouveau représentant au hasard";
 $lang['Public / Private'] = "Publique / Privée";
-$lang['Manage authorizations for selected categories'] = "Gérer le type d'accès pour les catégories sélectionnées";
-$lang['Select uploadable categories'] = "Sélectionner les catégories autorisées à l'ajout";
+$lang['Manage authorizations for selected albums'] = "Gérer le type d'accès pour les catégories sélectionnées";
+$lang['Select uploadable albums'] = "Sélectionner les catégories autorisées à l'ajout";
 $lang['Virtual album added'] = "Catégorie virtuelle ajoutée";
 $lang['Virtual album deleted'] = "Catégorie virtuelle supprimée";
-$lang['Category'] = "Catégorie";
 $lang['Access type'] = "Type d'accès";
 $lang['Comments'] = "Commentaires";
 $lang['Information data registered in database'] = "Informations enregistrées dans la base de données";
@@ -367,10 +365,10 @@ $lang['synchronize'] = "synchroniser";
 $lang['target'] = "Cible";
 $lang['Thumbnail'] = "Miniature";
 $lang['title'] = "Titre";
-$lang['Categories management'] = "Gestion des catégories";
+$lang['Album list management'] = "Gestion des catégories";
 $lang['Piwigo configuration'] = "Configuration de Piwigo";
 $lang['Piwigo administration'] = "Administration de Piwigo";
-$lang['Edit a category'] = "Modifier une catégorie";
+$lang['Edit album'] = "Modifier une catégorie";
 $lang['Group management'] = "Gestion des groupes";
 $lang['User list'] = "Liste des utilisateurs";
 $lang['Modify informations about a picture'] = "Modifier les informations d'une image";
@@ -401,9 +399,9 @@ $lang['unset'] = "vider";
 $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";
+$lang['reduce to single existing albums'] = "Traiter uniquement une catégorie";
 $lang['Choose an option'] = "Choisir une option";
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = "Afficher un maximum d'informations (catégories ajoutées, éléments ajoutés, catégories et éléments supprimés)";
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = "Afficher un maximum d'informations (catégories ajoutées, éléments ajoutés, catégories et éléments supprimés)";
 $lang['Piwigo version differs on the remote site'] = "La version Piwigo sur le site distant est différente";
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = "Les version de create_listing_file.php sur le site distant et Piwigo doivent être les mêmes";
 $lang['listing.xml file was not found'] = "le fichier listing.xml est introuvable";
@@ -415,12 +413,12 @@ $lang['File/directory read error'] = "Erreur d'ouverture fichier/répertoire";
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = "Le fichier ou répertoire ne peut pas être accessible (soit il n'existe pas, soit l'accès est refusé)";
 $lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = "Chaque fichier image requiert une miniature. La miniature doit être présente dans le sous-répertoire \"thumbnail\" du répertoire de la catégorie. Le nom du fichier de la miniature doit commencer avec le paramètre de configuration \"prefix_thumbnail\" et l'extension du nom du fichier doit être parmi la liste suivante :";
 $lang['missing thumbnail'] = "miniature manquante";
-$lang['categories deleted in the database'] = "catégories supprimées de la base de données";
+$lang['albums deleted in the database'] = "catégories supprimées de la base de données";
 $lang['elements deleted in the database'] = "éléments supprimés de la base de données";
 $lang['images candidates for metadata synchronization'] = "images candidates à la synchronisation avec les méta-données";
 $lang['elements informations synchronized with files metadata'] = "informations des images synchronisées avec les méta-données";
 $lang['errors during synchronization'] = "erreurs survenues durant la synchronisation";
-$lang['categories added in the database'] = "catégories ajoutées dans la base de données";
+$lang['albums added in the database'] = "catégories ajoutées dans la base de données";
 $lang['elements added in the database'] = "éléments ajoutés dans la base de données";
 $lang['elements updated in the database'] = "éléments mis à jour dans la base de données";
 $lang['Search for new images in the directories'] = "Chercher les nouvelles images dans les répertoires";
@@ -453,7 +451,7 @@ $lang['Toggle \'default group\' property'] = "Inverser la propriété 'groupe pa
 $lang['Advanced features'] = "Fonctions avancées";
 $lang['Not linked elements'] = "Éléments non liés";
 $lang['Specials'] = "Spéciales";
-$lang['Files with same name in more than one physical category'] = "Fichiers portant le même nom dans plusieurs catégories physiques";
+$lang['Files with same name in more than one physical album'] = "Fichiers portant le même nom dans plusieurs catégories physiques";
 $lang['Overall'] = "Vue globale";
 $lang['Year'] = "Année";
 $lang['Month'] = "Mois";
@@ -602,7 +600,7 @@ $lang['Templates configuration has been recorded.'] = "La configuration des temp
 $lang['All optimizations have been successfully completed.'] = "Toutes les optimisations ont été réalisées avec succès.";
 $lang['Optimizations have been completed with some errors.'] = "Les optimisations réalisées comportent certaines erreurs.";
 $lang['Modify information'] = "Modifier les informations";
-$lang['edit category informations'] = "éditer les informations de cette catégorie";
+$lang['edit album'] = "éditer les informations de cette catégorie";
 $lang['nothing'] = "Rien";
 $lang['overrides existing values with empty ones'] = "Écraser les données existantes avec des données vides";
 $lang['manage image ranks'] = "gérer l'ordre des images";
@@ -649,19 +647,19 @@ $lang['Forbid this theme to users'] = "Interdire ce thème aux utilisateurs";
 $lang['Set as default theme for unregistered and new users'] = "Thème par défaut pour les invités et les nouveaux utilisateurs";
 $lang['unknown'] = 'inconnu';
 $lang['Upload Photos'] = 'Ajoutez des photos';
-$lang['Drop into category'] = 'Mettre dans une catégorie';
+$lang['Drop into album'] = 'Mettre dans une catégorie';
 $lang['+ Add an upload box'] = '+ Ajouter une autre boîte de transfert';
 $lang['Upload'] = 'Transférer';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Créez le répertoire "%s" à la racine de votre installation Piwigo';
 $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['existing album'] = 'catégorie existante';
+$lang['create a new album'] = 'créer une nouvelle 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['Album "%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';
 $lang['Privacy level set to "%s"'] = 'Niveau de confidentialité "%s"';
-$lang['Category "%s" now contains %d photos'] = 'La catégorie "%s" contient désormais %d photos';
+$lang['Album "%s" now contains %d photos'] = 'La catégorie "%s" contient désormais %d photos';
 $lang['Manage this set of %d photos'] = 'Gérer ce lot de %d photos';
 $lang['Select files'] = 'Choisir des fichiers';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'Fichiers JPEG ou archives ZIP contenant des fichiers JPEG s\'il vous plaît.';
@@ -689,8 +687,6 @@ $lang['Your configuration settings are saved'] = 'Vos paramètres de configurati
 $lang['Active Themes'] = 'Thèmes activés';
 $lang['Add write access to the "%s" directory'] = 'Ajoutez l\'accès en écriture pour le répertoire "%s"';
 $lang['Administration Home'] = 'Accueil administration';
-$lang['Categories ordered alphanumerically'] = 'Catégories triés par ordre alphanumérique';
-$lang['Categories ordered alphanumerically reverse'] = 'Catégories triés par ordre alphanumérique inverse';
 $lang['Change Admin Colors'] = 'Modifier les couleurs de l\'administration';
 $lang['Delete this theme'] = 'Supprimer ce thème';
 $lang['Directory does not exist'] = 'Le répertoire n\'existe pas';
diff --git a/language/fr_CA/common.lang.php b/language/fr_CA/common.lang.php
index b4d10d3d8..2628a553f 100644
--- a/language/fr_CA/common.lang.php
+++ b/language/fr_CA/common.lang.php
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Au moins un des critère
 $lang['At least one tag must match'] = 'Au moins un mot clé doit correspondre';
 $lang['Author'] = 'Auteur';
 $lang['Average rate'] = 'Note moyenne';
-$lang['Categories'] = 'Catégories';
-$lang['Category'] = 'Catégorie';
+$lang['Albums'] = 'Catégories';
+$lang['Album'] = 'Catégorie';
 $lang['Close this window'] = 'Fermer cette fenêtre';
 $lang['Complete RSS feed (images, comments)'] = 'Flux RSS complet (images, commentaires)';
 $lang['Confirm Password'] = 'Confirmer le mot de passe';
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 7d3eca563..befca0cc1 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -61,11 +61,10 @@ $lang['Add'] = "Ajouter";
 $lang['Allow user registration'] = "Permettre l'enregistrement des utilisateurs";
 $lang['Apply to sub-albums'] = "Appliquer aux sous-catégories";
 $lang['Associated'] = "Associée à";
-$lang['Association to categories'] = "Association aux catégories";
 $lang['Batch management'] = "Gestion par lot";
 $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['Albums 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['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.";
@@ -125,17 +124,17 @@ $lang['New tag'] = "Nouveau tag";
 $lang['Number of comments per page'] = "Nombre de commentaires par page";
 $lang['Number of rates'] = "Nombre de notes";
 $lang['Number of thumbnails to create'] = "Nombre de miniatures à créer";
-$lang['Only private categories are listed'] = "Seules les catégories privées sont listées";
+$lang['Only private albums are listed'] = "Seules les catégories privées sont listées";
 $lang['Operating system'] = "Système d'exploitation";
 $lang['Options'] = "Options";
-$lang['Other private categories'] = "Autres catégories privées";
+$lang['Other private albums'] = "Autres catégories privées";
 $lang['Page banner'] = "Bannière des pages";
 $lang['Parent album'] = "Catégorie parente";
 $lang['Path'] = "Chemin";
 $lang['Permalink'] = "Lien permanent";
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = "Le lien permanent %s a été précédemment utilisé par la catégorie %s. Veuillez l'effacer de l'historique des liens permanents";
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = "Le lien permanent %s a été précédemment utilisé par la catégorie %s. Veuillez l'effacer de l'historique des liens permanents";
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = "Le lien permanent ne doit contenir des caractères que parmi \"a-zA-Z0-9\", \"-\", \"_\" ou \"/\". Il ne doit pas être numérique ou commencer par un nombre suivi par \"-\"";
-$lang['Permalink %s is already used by category %s'] = "Le lien permanent %s est déja utilisé par la catégorie %s";
+$lang['Permalink %s is already used by album %s'] = "Le lien permanent %s est déja utilisé par la catégorie %s";
 $lang['Permalink history'] = "Historique des liens permanents";
 $lang['Permalinks'] = "Liens permanents";
 $lang['Permission denied'] = "Accès interdit";
@@ -153,7 +152,7 @@ $lang['Rating'] = "Notation";
 $lang['Reject All'] = "Tout rejeter";
 $lang['Reject'] = "Rejeter";
 $lang['Representant'] = "Représentant";
-$lang['Representation of categories'] = "Représentation des catégories";
+$lang['Representation of albums'] = "Représentation des catégories";
 $lang['Representative'] = "Représentant";
 $lang['Represents'] = "Représente";
 $lang['Save order'] = "Sauvegarder l'ordre";
@@ -186,7 +185,7 @@ $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 album in its own sub album'] = "Vous ne pouvez pas déplacer une catégorie dans sa propre sous-catégorie";
+$lang['You cannot move an 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";
@@ -194,18 +193,17 @@ $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['Authorize users to add comments on selected albums'] = "Autoriser les utilisateurs à ajouter des commentaires dans les catégories sélectionnées";
 $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";
 $lang['Find a new representant by random'] = "Trouver un nouveau représentant au hasard";
 $lang['Public / Private'] = "Publique / Privée";
-$lang['Manage authorizations for selected categories'] = "Gérer le type d'accès pour les catégories sélectionnées";
-$lang['Select uploadable categories'] = "Sélectionner les catégories autorisées à l'ajout";
+$lang['Manage authorizations for selected albums'] = "Gérer le type d'accès pour les catégories sélectionnées";
+$lang['Select uploadable albums'] = "Sélectionner les catégories autorisées à l'ajout";
 $lang['Virtual album added'] = "Catégorie virtuelle ajoutée";
 $lang['Virtual album deleted'] = "Catégorie virtuelle supprimée";
-$lang['Category'] = "Catégorie";
 $lang['Access type'] = "Type d'accès";
 $lang['Comments'] = "Commentaires";
 $lang['Information data registered in database'] = "Informations enregistrées dans la base de données";
@@ -362,10 +360,10 @@ $lang['synchronize metadata'] = "Synchroniser les méta-données";
 $lang['target'] = "Cible";
 $lang['Thumbnail'] = "Miniature";
 $lang['title'] = "Titre";
-$lang['Categories management'] = "Gestion des catégories";
+$lang['Album list management'] = "Gestion des catégories";
 $lang['Piwigo configuration'] = "Configuration de Piwigo";
 $lang['Piwigo administration'] = "Administration de Piwigo";
-$lang['Edit a category'] = "Modifier une catégorie";
+$lang['Edit album'] = "Modifier une catégorie";
 $lang['Group management'] = "Gestion des groupes";
 $lang['User list'] = "Liste des utilisateurs";
 $lang['Modify informations about a picture'] = "Modifier les informations d'une image";
@@ -396,9 +394,9 @@ $lang['unset'] = "vider";
 $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";
+$lang['reduce to single existing albums'] = "Traiter uniquement une catégorie";
 $lang['Choose an option'] = "Choisir une option";
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = "Afficher un maximum d'informations (catégories ajoutées, éléments ajoutés, catégories et éléments supprimés)";
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = "Afficher un maximum d'informations (catégories ajoutées, éléments ajoutés, catégories et éléments supprimés)";
 $lang['Piwigo version differs on the remote site'] = "La version Piwigo sur le site distant est différente";
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = "Les version de create_listing_file.php sur le site distant et Piwigo doivent être les mêmes";
 $lang['listing.xml file was not found'] = "le fichier listing.xml est introuvable";
@@ -410,12 +408,12 @@ $lang['File/directory read error'] = "Erreur d'ouverture fichier/répertoire";
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = "Le fichier ou répertoire ne peut pas être accessible (soit il n'existe pas, soit l'accès est refusé)";
 $lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = "Chaque fichier image requiert une miniature. La miniature doit être présente dans le sous-répertoire \"thumbnail\" du répertoire de la catégorie. Le nom du fichier de la miniature doit commencer avec le paramètre de configuration \"prefix_thumbnail\" et l'extension du nom du fichier doit être parmi la liste suivante :";
 $lang['missing thumbnail'] = "miniature manquante";
-$lang['categories deleted in the database'] = "catégories supprimées de la base de données";
+$lang['albums deleted in the database'] = "catégories supprimées de la base de données";
 $lang['elements deleted in the database'] = "éléments supprimés de la base de données";
 $lang['images candidates for metadata synchronization'] = "images candidates à la synchronisation avec les méta-données";
 $lang['elements informations synchronized with files metadata'] = "informations des images synchronisées avec les méta-données";
 $lang['errors during synchronization'] = "erreurs survenues durant la synchronisation";
-$lang['categories added in the database'] = "catégories ajoutées dans la base de données";
+$lang['albums added in the database'] = "catégories ajoutées dans la base de données";
 $lang['elements added in the database'] = "éléments ajoutés dans la base de données";
 $lang['elements updated in the database'] = "éléments mis à jour dans la base de données";
 $lang['Search for new images in the directories'] = "Chercher les nouvelles images dans les répertoires";
@@ -447,7 +445,7 @@ $lang['Toggle \'default group\' property'] = "Inverser la propriété 'groupe pa
 $lang['Advanced features'] = "Fonctions avancées";
 $lang['Not linked elements'] = "Eléments non liés";
 $lang['Specials'] = "Spéciales";
-$lang['Files with same name in more than one physical category'] = "Fichiers portant le même nom dans plusieurs catégories physiques";
+$lang['Files with same name in more than one physical album'] = "Fichiers portant le même nom dans plusieurs catégories physiques";
 $lang['Overall'] = "Vue globale";
 $lang['Year'] = "Année";
 $lang['Month'] = "Mois";
@@ -592,7 +590,7 @@ $lang['Templates configuration has been recorded.'] = "La configuration des temp
 $lang['All optimizations have been successfully completed.'] = "Toutes les optimisations ont été réalisées avec succès.";
 $lang['Optimizations have been completed with some errors.'] = "Les optimisations réalisées comportent certaines erreurs.";
 $lang['Modify information'] = "Modifier les informations";
-$lang['edit category informations'] = "éditer les informations de cette catégorie";
+$lang['edit album'] = "éditer les informations de cette catégorie";
 $lang['nothing'] = "Rien";
 $lang['overrides existing values with empty ones'] = "Ecraser les données existantes avec des données vides";
 $lang['manage image ranks'] = "gérer l'ordre des images";
@@ -639,18 +637,18 @@ $lang['Set as default theme for unregistered and new users'] = "Thème par défa
 $lang['unknown'] = 'inconnu';
 
 $lang['Upload Photos'] = 'Ajoutez des photos';
-$lang['Drop into category'] = 'Déposer dans une catégorie';
+$lang['Drop into album'] = 'Déposer dans une catégorie';
 $lang['+ Add an upload box'] = '+ Ajouter une autre boîte de transfert';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Créez le répertoire "%s" à la racine de votre installation Piwigo';
 $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['existing album'] = 'catégorie existante';
+$lang['create a new album'] = 'créer une nouvelle 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['Album "%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';
 $lang['Privacy level set to "%s"'] = 'Niveau de confidentialité "%s"';
-$lang['Category "%s" now contains %d photos'] = 'La catégorie "%s" contient désormais %d photos';
+$lang['Album "%s" now contains %d photos'] = 'La catégorie "%s" contient désormais %d photos';
 $lang['Manage this set of %d photos'] = 'Gérer ce lot de %d photos';
 $lang['Select files'] = 'Choisir des fichiers';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'Fichiers JPEG ou archives ZIP contenant des fichiers JPEG s\'il vous plaît.';
@@ -771,5 +769,5 @@ $lang['Error on file "%s" : %s'] = 'Erreur sur le fichier "%s" : %s';
 $lang['Menu Management'] = 'Menus';
 $lang['automatic order'] = 'ordre automatique';
 $lang['manual order'] = 'ordre manuel';
-$lang['Categories automatically sorted'] = 'Les catégories ont été triées automatiquement';
+$lang['Albums automatically sorted'] = 'Les catégories ont été triées automatiquement';
 ?>
diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php
index c7c7f2858..fece9a39e 100644
--- a/language/fr_FR/common.lang.php
+++ b/language/fr_FR/common.lang.php
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Au moins un des critère
 $lang['At least one tag must match'] = 'Au moins un tag doit correspondre';
 $lang['Author'] = 'Auteur';
 $lang['Average rate'] = 'Note moyenne';
-$lang['Categories'] = 'Catégories';
-$lang['Category'] = 'Catégorie';
+$lang['Albums'] = 'Catégories';
+$lang['Album'] = 'Catégorie';
 $lang['Close this window'] = 'Fermer cette fenêtre';
 $lang['Complete RSS feed (images, comments)'] = 'Flux RSS complet (images, commentaires)';
 $lang['Confirm Password'] = 'Confirmer le mot de passe';
diff --git a/language/hr_HR/admin.lang.php b/language/hr_HR/admin.lang.php
index ba07f9ddd..5616d0b33 100644
--- a/language/hr_HR/admin.lang.php
+++ b/language/hr_HR/admin.lang.php
@@ -59,11 +59,10 @@ $lang['Add'] = 'Dodaj';
 $lang['Allow user registration'] = 'Odobri upis korisnika';
 $lang['Apply to sub-albums'] = 'Primjeni na podskupine';
 $lang['Associated'] = 'Povezanost';
-$lang['Association to categories'] = 'Povezanost sa skupinama';
 $lang['Batch management'] = 'Slijedna uprava';
 $lang['Caddie management'] = 'Uprava ladice';
 $lang['Caddie'] = 'Ladica';
-$lang['Categories authorized thanks to group associations'] = 'Skupine ovjerene zahvaljujući grupnoj povezanosti';
+$lang['Albums authorized thanks to group associations'] = 'Skupine ovjerene zahvaljujući grupnoj povezanosti';
 $lang['Album manual order was saved'] = 'Stvarni redoslijed skupina je pohranjen';
 $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.';
@@ -123,16 +122,16 @@ $lang['New tag'] = 'Novi tag';
 $lang['Number of comments per page'] = 'Broj komentara po stranici';
 $lang['Number of rates'] = 'Broj ocjena';
 $lang['Number of thumbnails to create'] = 'broj poveznih sličica za izradu';
-$lang['Only private categories are listed'] = 'Samo osobne skupine su ispisane';
+$lang['Only private albums are listed'] = 'Samo osobne skupine su ispisane';
 $lang['Operating system'] = 'Operativni sustav';
 $lang['Options'] = 'Mogućnosti';
-$lang['Other private categories'] = 'Ostale osobne skupine';
+$lang['Other private albums'] = 'Ostale osobne skupine';
 $lang['Page banner'] = 'Baner stranice';
 $lang['Parent album'] = 'Nadređena skupina';
 $lang['Permalink'] = 'Stalna poveznica';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'Stalna poveznica %s je prethodno korištena od skupine %s. Prvo je izbrišite iz starih zapisa';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'Stalna poveznica %s je prethodno korištena od skupine %s. Prvo je izbrišite iz starih zapisa';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'Stalna poveznica mora biti sastavljena od znakova a-z, A-Z, 0-9, "-", "_" ili "/". Ne smije biti brojčana vrijednost ili počinjati brojem pa znakom "-"';
-$lang['Permalink %s is already used by category %s'] = 'Stalnu poveznicu %s već koristi skupina %s';
+$lang['Permalink %s is already used by album %s'] = 'Stalnu poveznicu %s već koristi skupina %s';
 $lang['Permalink history'] = 'Povijest stalnih poveznica';
 $lang['Permalinks'] = 'Stalne poveznice';
 $lang['Permission denied'] = 'Dozvola uskraćena';
@@ -150,7 +149,7 @@ $lang['Rating'] = 'Ocjenjivanje';
 $lang['Reject All'] = 'Odbaci Sve';
 $lang['Reject'] = 'Odbaci';
 $lang['Representant'] = 'Predstavnik';
-$lang['Representation of categories'] = 'Predstavljanje skupina';
+$lang['Representation of albums'] = 'Predstavljanje skupina';
 $lang['Representative'] = 'Predstavljeno';
 $lang['Represents'] = 'Predstavlja';
 $lang['Save order'] = 'Redoslijed pohrane';
@@ -183,7 +182,7 @@ $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 album in its own sub album'] = 'Ne možete premjestiti skupinu u njenu vlastitu podskupinu';
+$lang['You cannot move an 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';
@@ -191,18 +190,17 @@ $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['Authorize users to add comments on selected albums'] = 'Ovlastite korisnike za davanje komentara u odabranim skupinama';
 $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';
 $lang['Find a new representant by random'] = 'Izbor novog predstavnika slučajnim odabirom';
 $lang['Public / Private'] = 'Javno / Osobno';
-$lang['Manage authorizations for selected categories'] = 'Upravljanje ovlastima za odabrane skupine';
-$lang['Select uploadable categories'] = 'Odaberite skupine za prebačaj';
+$lang['Manage authorizations for selected albums'] = 'Upravljanje ovlastima za odabrane skupine';
+$lang['Select uploadable albums'] = 'Odaberite skupine za prebačaj';
 $lang['Virtual album added'] = 'Nestvarna skupina dodana';
 $lang['Virtual album deleted'] = 'Nestvarna skupina izbrisana';
-$lang['Category'] = 'Skupina';
 $lang['Access type'] = 'Vrsta pristupa';
 $lang['Comments'] = 'Komentari';
 $lang['Information data registered in database'] = 'Podaci upisani u bazu podataka';
@@ -354,10 +352,10 @@ $lang['synchronize metadata'] = 'uskladi meta podatke';
 $lang['target'] = 'odredište';
 $lang['Thumbnail'] = 'Povezne sličice';
 $lang['title'] = 'naslov';
-$lang['Categories management'] = 'Upravljanje skupinama';
+$lang['Album list management'] = 'Upravljanje skupinama';
 $lang['Piwigo configuration'] = 'Piwigo postave';
 $lang['Piwigo administration'] = 'Piwigo uprava';
-$lang['Edit a category'] = 'Uredi skupinu';
+$lang['Edit album'] = 'Uredi skupinu';
 $lang['Group management'] = 'Upravljanje grupama';
 $lang['User list'] = 'Popis korisnika';
 $lang['Modify informations about a picture'] = 'Promjena podataka o slici';
@@ -388,9 +386,9 @@ $lang['unset'] = 'razdešeno';
 $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';
+$lang['reduce to single existing albums'] = 'suzi na jednu postojeću skupinu-e';
 $lang['Choose an option'] = 'Izaberite mogućnost';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = 'najopširniji mogući prikaz podataka (dodane skupine i stavke, izbrisane  skupine i stavke)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = 'najopširniji mogući prikaz podataka (dodane skupine i stavke, izbrisane  skupine i stavke)';
 $lang['Piwigo version differs on the remote site'] = 'Piwigo inačica na udaljenom mjestu se razlikuje';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'Inačica create_listing_file.php na udaljenom mjestu i Piwigo-u mora biti jednaka';
 $lang['listing.xml file was not found'] = 'listing.xml zapis nije pronađen';
@@ -402,12 +400,12 @@ $lang['File/directory read error'] = 'Greška čitanja zapisa/mape';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'Zapisu ili mapi se ne može pristupiti (ne postoji ili je pristup zabranjen)';
 $lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'tip slikovnog zapisa zahtjeva poveznu sličicu. Povezna sličica mora biti prisutna u podmapi "thumbnail" mape skupine. Naziv povezne sličice mora počinjati sa pretpostavljenim predznakom i nastavak mora biti jedan od popisanih :';
 $lang['missing thumbnail'] = 'nedostajuće povezne sličice';
-$lang['categories deleted in the database'] = 'skupine izbrisane iz baze podataka';
+$lang['albums deleted in the database'] = 'skupine izbrisane iz baze podataka';
 $lang['elements deleted in the database'] = 'stavke izbrisane iz baze podataka';
 $lang['images candidates for metadata synchronization'] = 'slika kandidata za usklađivanje meta podataka';
 $lang['elements informations synchronized with files metadata'] = 'podataka stavaka usklađeno sa meta podacima zapisa';
 $lang['errors during synchronization'] = 'grešaka tijekom usklađivanja';
-$lang['categories added in the database'] = 'skupina dodano u bazu podataka';
+$lang['albums added in the database'] = 'skupina dodano u bazu podataka';
 $lang['elements added in the database'] = 'stavaka dodano u bazu podataka';
 $lang['elements updated in the database'] = 'stavaka obnovljeno u bazi podataka';
 $lang['Search for new images in the directories'] = 'Pretraživanje novih slika u mapama';
@@ -439,7 +437,7 @@ $lang['Toggle \'default group\' property'] = 'Promijeni \'pretpostavljena grupa\
 $lang['Advanced features'] = 'Napredne mogućnosti';
 $lang['Not linked elements'] = 'Nema povezanih stavki';
 $lang['Specials'] = 'Posebnosti';
-$lang['Files with same name in more than one physical category'] = 'Zapisi istog imena u više od jednoj stvarnoj skupini';
+$lang['Files with same name in more than one physical album'] = 'Zapisi istog imena u više od jednoj stvarnoj skupini';
 $lang['Overall'] = 'Sveukupno';
 $lang['Year'] = 'Godina';
 $lang['Month'] = 'Mjesec';
@@ -586,7 +584,7 @@ $lang['Templates configuration has been recorded.'] = 'Postava predložaka je po
 $lang['All optimizations have been successfully completed.'] = 'Sva poboljšanja su uspješno dovršena.';
 $lang['Optimizations have been completed with some errors.'] = 'Poboljšanja su izvršena uz neke greške.';
 $lang['Modify information'] = 'Promijeni podatak';
-$lang['edit category informations'] = 'uredi podatke o skupini';
+$lang['edit album'] = 'uredi podatke o skupini';
 $lang['nothing'] = 'ništa';
 $lang['overrides existing values with empty ones'] = 'prekucava postojeće vrijednosti praznim poljima';
 $lang['manage image ranks'] = 'upravljanje poretkom slika';
@@ -635,18 +633,18 @@ $lang['Forbid this theme to users'] = 'Zabrani ovu temu korisnicima';
 $lang['Set as default theme for unregistered and new users'] = 'Postavi za pretpostavljenu temu za nepoznate i nove korisnike';
 $lang['unknown'] = 'nepoznat';
 $lang['Upload Photos'] = 'Prebaci Slike';
-$lang['Drop into category'] = 'Spusti u skupinu';
+$lang['Drop into album'] = 'Spusti u skupinu';
 $lang['+ Add an upload box'] = '+ Dodaj kutiju prebacivanja';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Izradi "%s" mapu u korijenu vaše Piwigo galerije';
 $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['existing album'] = 'postojeća skupina';
+$lang['create a new album'] = 'stvori novu skupinu';
 $lang['Album name'] = 'Naziv skupine';
-$lang['Category "%s" has been added'] = 'Skupina "%s" je dodana';
+$lang['Album "%s" has been added'] = 'Skupina "%s" je dodana';
 $lang['Uploaded Photos'] = 'Prebačene Slike';
 $lang['%d photos uploaded'] = '%d slika prebačeno';
 $lang['Privacy level set to "%s"'] = 'Razina privatnosti postavljena na "%s"';
-$lang['Category "%s" now contains %d photos'] = 'Skupina "%s" sada sadržava %d slika';
+$lang['Album "%s" now contains %d photos'] = 'Skupina "%s" sada sadržava %d slika';
 $lang['Manage this set of %d photos'] = 'Upravljanje ovim skupom od %d slika';
 $lang['Select files'] = 'Odaberi zapise';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG zapisi ili ZIP arhive sa JPEG zapisima unutra molim.';
diff --git a/language/hr_HR/common.lang.php b/language/hr_HR/common.lang.php
index edaaba6b9..4e46bdd45 100644
--- a/language/hr_HR/common.lang.php
+++ b/language/hr_HR/common.lang.php
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Najmanje jedno od navede
 $lang['At least one tag must match'] = 'Najmanje jedan tag se mora poklapati';
 $lang['Author'] = 'Autor';
 $lang['Average rate'] = 'Prosječna ocjena';
-$lang['Categories'] = 'Skupine';
-$lang['Category'] = 'Skupina';
+$lang['Albums'] = 'Skupine';
+$lang['Album'] = 'Skupina';
 $lang['Close this window'] = 'Zatvori prozor';
 $lang['Complete RSS feed (images, comments)'] = 'Potpuni RSS izvori (slike, komentari)';
 $lang['Confirm Password'] = 'Potvrdi Zaporku';
diff --git a/language/hu_HU/admin.lang.php b/language/hu_HU/admin.lang.php
index 0104db214..0540588e3 100644
--- a/language/hu_HU/admin.lang.php
+++ b/language/hu_HU/admin.lang.php
@@ -59,11 +59,10 @@ $lang['Add'] = 'Hozzáadás';
 $lang['Allow user registration'] = 'Regisztráció engedélyezése';
 $lang['Apply to sub-albums'] = 'Alkategóriákra is';
 $lang['Associated'] = 'Hozzárendelve';
-$lang['Association to categories'] = 'Hozzárendelés kategóriához';
 $lang['Batch management'] = 'Csoportos kezelés';
 $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['Albums 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['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.';
@@ -123,17 +122,17 @@ $lang['New tag'] = 'Új címke';
 $lang['Number of comments per page'] = 'Hozzászólások száma oldalanként';
 $lang['Number of rates'] = 'Értékelések száma';
 $lang['Number of thumbnails to create'] = 'Elkészítendő bélyegképek száma';
-$lang['Only private categories are listed'] = 'Csak privát kategóriák megjelenítése';
+$lang['Only private albums are listed'] = 'Csak privát kategóriák megjelenítése';
 $lang['Operating system'] = 'Operációs rendszer';
 $lang['Options'] = 'Beállítások';
-$lang['Other private categories'] = 'Más privát kategóriák';
+$lang['Other private albums'] = 'Más privát kategóriák';
 $lang['Page banner'] = 'Oldal fejléc';
 $lang['Parent album'] = 'Szülő kategória';
 $lang['Path'] = 'Elérési út';
 $lang['Permalink'] = 'Közvetlen link';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'A(z) %s közvetlen link név korábban létrehozva a(z) %s kategória számára. Törölni kell a közvetlen link előzményekből.';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'A(z) %s közvetlen link név korábban létrehozva a(z) %s kategória számára. Törölni kell a közvetlen link előzményekből.';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'A közvetlen linkek a következő karakterekből állhatnak: a-z, A-Z, 0-9, "-" vagy "_". Nem kezdődhetnek számmal vagy "-" karakterrel';
-$lang['Permalink %s is already used by category %s'] = 'A(z) %s közvetlen link név a(z) %s kategória számára lefoglalva. Válasszon másikat!';
+$lang['Permalink %s is already used by album %s'] = 'A(z) %s közvetlen link név a(z) %s kategória számára lefoglalva. Válasszon másikat!';
 $lang['Permalink history'] = 'Közvetlen link előzmények';
 $lang['Permalinks'] = 'Közvetlen linkek';
 $lang['Permission denied'] = 'Hozzáférés megtagadva';
@@ -151,7 +150,7 @@ $lang['Rating'] = 'Értékelés';
 $lang['Reject All'] = 'Mind elvetése';
 $lang['Reject'] = 'Elvetés';
 $lang['Representant'] = 'Reprezentál';
-$lang['Representation of categories'] = 'Kategóriák reprezentálása';
+$lang['Representation of albums'] = 'Kategóriák reprezentálása';
 $lang['Representative'] = 'Reprezentatív';
 $lang['Represents'] = 'Reprezentál';
 $lang['Save order'] = 'Sorrend mentése';
@@ -183,7 +182,7 @@ $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 album in its own sub album'] = 'A kategóriát lehetetlen az alkategóriájába helyezni';
+$lang['You cannot move an 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ó';
@@ -191,18 +190,17 @@ $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['Authorize users to add comments on selected albums'] = 'Hozzászólás engedélyezése a kiválasztott kategóriákhoz';
 $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';
 $lang['Find a new representant by random'] = 'Új kategória-képviselő véletlenszerű kiválasztása';
 $lang['Public / Private'] = 'Nyilvános / Privát';
-$lang['Manage authorizations for selected categories'] = 'A kiválasztott kategóriák engedélyeinek kezelése';
-$lang['Select uploadable categories'] = 'Feltöltés engedélyezése a kiválasztott kategóriákba';
+$lang['Manage authorizations for selected albums'] = 'A kiválasztott kategóriák engedélyeinek kezelése';
+$lang['Select uploadable albums'] = 'Feltöltés engedélyezése a kiválasztott kategóriákba';
 $lang['Virtual album added'] = 'Virtuális kategória hozzáadva';
 $lang['Virtual album deleted'] = 'Virtuális kategória törölve';
-$lang['Category'] = 'Kategória';
 $lang['Access type'] = 'Hozzáférés típusa';
 $lang['Comments'] = 'Hozzászólások';
 $lang['Information data registered in database'] = 'Az információk bekerültek az adatbázisba';
@@ -355,10 +353,10 @@ $lang['synchronize metadata'] = 'Meta adatok szinkronizálása';
 $lang['target'] = 'Cél';
 $lang['Thumbnail'] = 'Bélyegkép';
 $lang['title'] = 'Cím';
-$lang['Categories management'] = 'Kategóriák kezelése';
+$lang['Album list management'] = 'Kategóriák kezelése';
 $lang['Piwigo configuration'] = 'Piwigo konfiguráció';
 $lang['Piwigo administration'] = 'Piwigo adminisztráció';
-$lang['Edit a category'] = 'Kategória javítása';
+$lang['Edit album'] = 'Kategória javítása';
 $lang['Group management'] = 'Csoportok kezelése';
 $lang['User list'] = 'Felhasználók listája';
 $lang['Modify informations about a picture'] = 'Képinformációk módosítása';
@@ -389,9 +387,9 @@ $lang['unset'] = 'Eltávolítás';
 $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';
+$lang['reduce to single existing albums'] = 'Szűkítés egy már meglévő kategóriára';
 $lang['Choose an option'] = 'Válasszon az alábbi lehetőségek közül';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = 'Összes információ megjelenítése (hozzáadott kategóriák és elemek, törölt kategóriák és elemek)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = 'Összes információ megjelenítése (hozzáadott kategóriák és elemek, törölt kategóriák és elemek)';
 $lang['Piwigo version differs on the remote site'] = 'Piwigo verzió eltér a távoli oldalon';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'A create_listing_file.php verziójának azonosnak kell lenni a távoli oldalon lévővel';
 $lang['listing.xml file was not found'] = 'listing.xml fájl nem található';
@@ -403,12 +401,12 @@ $lang['File/directory read error'] = 'Fájl/Mappa olvasási hiba';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'A fájl vagy mappa hozzáférhetetlen (vagy nem létezik, vagy hozzáférés megtagadva)';
 $lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'A képeknek rendelkezniük kell bélyegképpel. A bélyegképnek a kép mappájának "thumbnail" almappájában kell lennie. A bélyegkép nevének a meghatározott előtaggal kell kezdődnie, és a következő kiterjesztése lehet:';
 $lang['missing thumbnail'] = 'bélyegkép hiányzik';
-$lang['categories deleted in the database'] = 'adatbázisból törölt kategória';
+$lang['albums deleted in the database'] = 'adatbázisból törölt kategória';
 $lang['elements deleted in the database'] = 'adatbázisból törölt elem';
 $lang['images candidates for metadata synchronization'] = 'kép meta adatainak szinkronizálása';
 $lang['elements informations synchronized with files metadata'] = 'elem meta adatainak szinkronizálása';
 $lang['errors during synchronization'] = 'hiba történt a szinkronizálás során';
-$lang['categories added in the database'] = 'kategória hozzáadva az adatbázishoz';
+$lang['albums added in the database'] = 'kategória hozzáadva az adatbázishoz';
 $lang['elements added in the database'] = 'elem hozzáadva az adatbázishoz';
 $lang['elements updated in the database'] = 'elem frissítve az adatbázisban';
 $lang['Search for new images in the directories'] = 'Új képek keresése a mappákban';
@@ -440,7 +438,7 @@ $lang['Toggle \'default group\' property'] = '\'Alapértelmezett csoport\' tulaj
 $lang['Advanced features'] = 'Speciális funkciók';
 $lang['Not linked elements'] = 'Nem kapcsolódó elemek';
 $lang['Specials'] = 'Speciális összetevők';
-$lang['Files with same name in more than one physical category'] = 'Keresse meg az azonos nevű fájlokat';
+$lang['Files with same name in more than one physical album'] = 'Keresse meg az azonos nevű fájlokat';
 
 $lang['Overall'] = 'Teljes';
 $lang['Year'] = 'Év';
@@ -588,7 +586,7 @@ $lang['Templates configuration has been recorded.'] = 'Sablon konfiguráció rö
 $lang['All optimizations have been successfully completed.'] = 'Minden optimalizálás sikeres.';
 $lang['Optimizations have been completed with some errors.'] = 'Néhány hiba fordult elő az optimalizáláskor.';
 $lang['Modify information'] = 'Információk módosítása';
-$lang['edit category informations'] = 'Kategória információk szerkesztése';
+$lang['edit album'] = 'Kategória információk szerkesztése';
 $lang['nothing'] = 'Nem';
 $lang['overrides existing values with empty ones'] = 'Felülírja a meglévő üres értékeket';
 $lang['manage image ranks'] = 'Kép rangok kezelése';
@@ -625,18 +623,18 @@ $lang['Allow users to delete theirs owns comments'] = 'A felhasználók törölh
 $lang['Email administrators when a comment is modified'] = 'Email az adminisztrátornak, ha egy hozzászólást módosítottak';
 $lang['Email administrators when a comment is deleted'] = 'Email az adminisztrátornak, ha egy hozzászólást töröltek';
 $lang['Upload Photos'] = 'Képek feltöltése';
-$lang['Drop into category'] = 'Kategória választás:';
+$lang['Drop into album'] = 'Kategória választás:';
 $lang['+ Add an upload box'] = '+ További képek feltöltése...';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = '"%s" könyvtár létrehozása a telepített Piwigo galériában.';
 $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['existing album'] = 'létező kategória';
+$lang['create a new album'] = 'új kategória létrehozása';
 $lang['Album name'] = 'Kategória neve';
-$lang['Category "%s" has been added'] = '"%s" kategória hozzáadva';
+$lang['Album "%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';
 $lang['Privacy level set to "%s"'] = 'Minimum hozzáférési szint itt: "%s"';
-$lang['Category "%s" now contains %d photos'] = '"%s" kategóriában már %d kép található';
+$lang['Album "%s" now contains %d photos'] = '"%s" kategóriában már %d kép található';
 $lang['Manage this set of %d photos'] = 'Szerkessze a készlet (%d elem) képeit';
 $lang['Select files'] = 'Képek kiválasztása';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG kiterjesztésű képeket, vagy JPEG képeket tartalmazó ZIP archivumot kérek.';
diff --git a/language/hu_HU/common.lang.php b/language/hu_HU/common.lang.php
index 7c588a571..99a4a0b08 100644
--- a/language/hu_HU/common.lang.php
+++ b/language/hu_HU/common.lang.php
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Az alábbiakból legalá
 $lang['At least one tag must match'] = 'Legalább egy címkének egyeznie kell';
 $lang['Author'] = 'Szerző';
 $lang['Average rate'] = 'Átlagos pontszám';
-$lang['Categories'] = 'Kategóriák';
-$lang['Category'] = 'Kategória';
+$lang['Albums'] = 'Kategóriák';
+$lang['Album'] = 'Kategória';
 $lang['Close this window'] = 'Ablak bezárása';
 $lang['Complete RSS feed (images, comments)'] = 'Teljes RSS (képek, hozzászólások)';
 $lang['Confirm Password'] = 'Jelszó megerősítése';
diff --git a/language/it_IT/admin.lang.php b/language/it_IT/admin.lang.php
index fd926d25d..c18820f3e 100644
--- a/language/it_IT/admin.lang.php
+++ b/language/it_IT/admin.lang.php
@@ -61,11 +61,10 @@ $lang['Add'] = 'Aggiungere';
 $lang['Allow user registration'] = 'Consentire l\'iscrizione degli \'ospiti\'';
 $lang['Apply to sub-albums'] = 'Applicare alle sottocategorie';
 $lang['Associated'] = 'Associato a';
-$lang['Association to categories'] = 'Associazione alle categorie';
 $lang['Batch management'] = 'Gestione per lotti';
 $lang['Caddie management'] = 'Gestione del cestino';
 $lang['Caddie'] = 'Cestino';
-$lang['Categories authorized thanks to group associations'] = 'Categorie accessibili grazie all\'appartenenza ai gruppi';
+$lang['Albums 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['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.';
@@ -125,17 +124,17 @@ $lang['New tag'] = 'Nuovo tag';
 $lang['Number of comments per page'] = 'Numero di commenti per pagina';
 $lang['Number of rates'] = 'Numero di voti';
 $lang['Number of thumbnails to create'] = 'Numero di miniature da creare';
-$lang['Only private categories are listed'] = 'Solo le categorie private sono elencate';
+$lang['Only private albums are listed'] = 'Solo le categorie private sono elencate';
 $lang['Operating system'] = 'Sistema operativo';
 $lang['Options'] = 'Opzioni';
-$lang['Other private categories'] = 'Altre categorie private';
+$lang['Other private albums'] = 'Altre categorie private';
 $lang['Page banner'] = 'Banner di pagina';
 $lang['Parent album'] = 'Categoria principale';
 $lang['Path'] = 'Percorso';
 $lang['Permalink'] = 'Permalink';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'Il permalink %s è stato usato precedentemente per la categoria %s. Cancellarlo prima dalla cronologia';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'Il permalink %s è stato usato precedentemente per la categoria %s. Cancellarlo prima dalla cronologia';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'Il permalink deve essere composto unicamente dai caratteri seguenti : "a-zA-Z0-9", "-" o "_". Non deve essere numerico o iniziare con un numero seguito da "-"';
-$lang['Permalink %s is already used by category %s'] = 'Il permalink %s è già  usato nella galleria %s';
+$lang['Permalink %s is already used by album %s'] = 'Il permalink %s è già  usato nella galleria %s';
 $lang['Permalink history'] = 'Cronologia dei permalinks';
 $lang['Permalinks'] = 'Permalinks';
 $lang['Permission denied'] = 'Accesso non autorizzato';
@@ -153,7 +152,7 @@ $lang['Rating'] = 'Voto';
 $lang['Reject All'] = 'Rifiutare tutto';
 $lang['Reject'] = 'Rifiutare';
 $lang['Representant'] = 'Copertina';
-$lang['Representation of categories'] = 'Copertine delle categorie';
+$lang['Representation of albums'] = 'Copertine delle categorie';
 $lang['Representative'] = 'Rappresentativa';
 $lang['Represents'] = 'Rappresenta';
 $lang['Save order'] = 'Salvare l\'ordine';
@@ -186,7 +185,7 @@ $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 album in its own sub album'] = 'Non potete spostare una categoria in una sua sottocategoria.';
+$lang['You cannot move an 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';
@@ -194,18 +193,17 @@ $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['Authorize users to add comments on selected albums'] = 'Autorizzare gli utenti ad aggiungere commenti nelle categorie selezionate';
 $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';
 $lang['Find a new representant by random'] = 'Scegliere una nuova copertina a caso';
 $lang['Public / Private'] = 'Pubblica / Privata';
-$lang['Manage authorizations for selected categories'] = 'Gestire le autorizzazione per le categorie selezionate';
-$lang['Select uploadable categories'] = 'Selezionare le categorie su cui è possibile caricare nuove immagini';
+$lang['Manage authorizations for selected albums'] = 'Gestire le autorizzazione per le categorie selezionate';
+$lang['Select uploadable albums'] = 'Selezionare le categorie su cui è possibile caricare nuove immagini';
 $lang['Virtual album added'] = 'Categoria virtuale aggiunta';
 $lang['Virtual album deleted'] = 'Categoria virtuale cancellata';
-$lang['Category'] = 'Categoria';
 $lang['Access type'] = 'Tipo di accesso';
 $lang['Comments'] = 'Commenti utente';
 $lang['Information data registered in database'] = 'Informazioni registrate nel database';
@@ -361,10 +359,10 @@ $lang['synchronize metadata'] = 'Sincronizzare i metadati';
 $lang['target'] = 'Target';
 $lang['Thumbnail'] = 'Miniatura';
 $lang['title'] = 'Titolo';
-$lang['Categories management'] = 'Gestione delle categorie';
+$lang['Album list management'] = 'Gestione delle categorie';
 $lang['Piwigo configuration'] = 'Configurazione di Piwigo';
 $lang['Piwigo administration'] = 'Amministrazione di Piwigo';
-$lang['Edit a category'] = 'Modificare una categoria';
+$lang['Edit album'] = 'Modificare una categoria';
 $lang['Group management'] = 'Gestione gruppi';
 $lang['User list'] = 'Elenco utenti';
 $lang['Modify informations about a picture'] = 'Modificare le informazioni dell\'immagine';
@@ -395,9 +393,9 @@ $lang['unset'] = 'Svuotare';
 $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';
+$lang['reduce to single existing albums'] = 'Eseguire unicamente sulle categorie selezionate';
 $lang['Choose an option'] = 'Scegli un\'opzione';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = 'Mostra tutte le informazioni possibili (categorie ed elementi aggiunti o eliminati)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = 'Mostra tutte le informazioni possibili (categorie ed elementi aggiunti o eliminati)';
 $lang['Piwigo version differs on the remote site'] = 'La versione di Piwigo differisce da quella sul server remoto';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'La versione del file "create_listing_file.php" sul server remoto deve essere la stessa di Piwigo';
 $lang['listing.xml file was not found'] = 'Il file "listing.xml" non è stato trovato';
@@ -409,12 +407,12 @@ $lang['File/directory read error'] = 'Errore in letture del file/directory';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'Non è possibile accedere al file o alla directory (probabilmente non esiste o l\'accesso è stato negato)';
 $lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'Ogni file immagine richiede una miniatura. La miniatura deve essere presente nella sottodirectory "thumbnail" della directory. Il nome del file della miniatura deve iniziare con il parametro di configurazione "prefix_thumbnail" e l\'estensione deve essere uno di valori dell\'elenco seguente:';
 $lang['missing thumbnail'] = 'miniature mancanti';
-$lang['categories deleted in the database'] = 'categorie eliminate dal database';
+$lang['albums deleted in the database'] = 'categorie eliminate dal database';
 $lang['elements deleted in the database'] = 'elementi eliminati dal database';
 $lang['images candidates for metadata synchronization'] = 'immagini in coda per la sincronizzazione dei metadati';
 $lang['elements informations synchronized with files metadata'] = 'informazioni sugli elementi sincronizzate con i metadati';
 $lang['errors during synchronization'] = 'Si sono verificati errori durante la sincronizzazione';
-$lang['categories added in the database'] = 'categorie aggiunte nel database';
+$lang['albums added in the database'] = 'categorie aggiunte nel database';
 $lang['elements added in the database'] = 'elementi aggiunti nel database';
 $lang['elements updated in the database'] = 'elementi aggiornati nel database';
 $lang['Search for new images in the directories'] = 'Cercare nuove immagini nelle directory';
@@ -446,7 +444,7 @@ $lang['Toggle \'default group\' property'] = 'Invertire la proprietà  "gruppo
 $lang['Advanced features'] = 'Funzioni avanzate';
 $lang['Not linked elements'] = 'Elementi non collegati';
 $lang['Specials'] = 'Speciale';
-$lang['Files with same name in more than one physical category'] = 'File con stesso nome in più di una categoria fisica';
+$lang['Files with same name in more than one physical album'] = 'File con stesso nome in più di una categoria fisica';
 $lang['Overall'] = 'Vista globale';
 $lang['Year'] = 'Anno';
 $lang['Month'] = 'Mese';
@@ -591,7 +589,7 @@ $lang['Templates configuration has been recorded.'] = 'La configurazione dei tem
 $lang['All optimizations have been successfully completed.'] = 'Tutte le ottimizzazioni sono state completate con successo.';
 $lang['Optimizations have been completed with some errors.'] = 'Le ottimizzazioni sono state completate con alcuni errori.';
 $lang['Modify information'] = 'Modifica le informazioni';
-$lang['edit category informations'] = 'Modificare le informazioni della categoria';
+$lang['edit album'] = 'Modificare le informazioni della categoria';
 $lang['nothing'] = 'Niente';
 $lang['overrides existing values with empty ones'] = 'Sovrascrivere i valori esistenti con quelli vuoti';
 $lang['manage image ranks'] = 'Gestire l\'ordinamento delle immagini';
@@ -640,18 +638,18 @@ $lang['Set as default theme for unregistered and new users'] = 'Tema di default
 $lang['unknown'] = 'sconosciuto';
 
 $lang['Upload Photos'] = 'Aggiungere foto';
-$lang['Drop into category'] = 'Scegliere una categoria';
+$lang['Drop into album'] = 'Scegliere una categoria';
 $lang['+ Add an upload box'] = '+ Aggiungere un altro campo di upload';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Creare la directory "% s" nella radice della vostra installazione Piwigo';
 $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['existing album'] = 'categoria esistente';
+$lang['create a new album'] = 'creare una nuova categoria';
 $lang['Album name'] = 'Nome della categoria';
-$lang['Category "%s" has been added'] = 'La categoria "%s" è stata aggiunta';
+$lang['Album "%s" has been added'] = 'La categoria "%s" è stata aggiunta';
 $lang['Uploaded Photos'] = 'Foto aggiunte ';
 $lang['%d photos uploaded'] = '%d foto aggiunte';
 $lang['Privacy level set to "%s"'] = 'Livello di confidenzialità t "%s"';
-$lang['Category "%s" now contains %d photos'] = 'La categoria "%s" adesso contiene %d foto';
+$lang['Album "%s" now contains %d photos'] = 'La categoria "%s" adesso contiene %d foto';
 $lang['Manage this set of %d photos'] = 'Gestire questo set di %d foto';
 $lang['Select files'] = 'Scegliere i file';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'File JPEG o archivi ZIP con dentro dei file JPEG per cortesia.';
diff --git a/language/it_IT/common.lang.php b/language/it_IT/common.lang.php
index 0a78bfc59..d2d53cd02 100644
--- a/language/it_IT/common.lang.php
+++ b/language/it_IT/common.lang.php
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Almeno una delle regole
 $lang['At least one tag must match'] = 'Almeno un tag deve corrispondere';
 $lang['Author'] = 'Autore';
 $lang['Average rate'] = 'Voto medio';
-$lang['Categories'] = 'Categorie';
-$lang['Category'] = 'Categoria';
+$lang['Albums'] = 'Categorie';
+$lang['Album'] = 'Categoria';
 $lang['Close this window'] = 'Chiudi questa finestra';
 $lang['Complete RSS feed (images, comments)'] = 'Feed RSS completo (immagini, commenti)';
 $lang['Confirm Password'] = 'Conferma la Password';
diff --git a/language/ja_JP/admin.lang.php b/language/ja_JP/admin.lang.php
index 60d7c6727..509525508 100644
--- a/language/ja_JP/admin.lang.php
+++ b/language/ja_JP/admin.lang.php
@@ -59,11 +59,10 @@ $lang['Add'] = '追加';
 $lang['Allow user registration'] = 'ユーザ登録を許可する';
 $lang['Apply to sub-albums'] = 'サブカテゴリに適用する';
 $lang['Associated'] = '関連';
-$lang['Association to categories'] = 'カテゴリの関連';
 $lang['Batch management'] = 'バッチ管理';
 $lang['Caddie management'] = 'キャディ管理';
 $lang['Caddie'] = 'キャディ';
-$lang['Categories authorized thanks to group associations'] = 'グループの関連付けによりカテゴリが許可されました。';
+$lang['Albums authorized thanks to group associations'] = 'グループの関連付けによりカテゴリが許可されました。';
 $lang['Album manual order was saved'] = 'カテゴリの手動順が保存されました。';
 $lang['Album elements associated to the following albums: %s'] = '以下のカテゴリに関連するカテゴリエレメント: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = '不明な理由により、アップグレードのチェックが失敗しました。';
@@ -123,17 +122,17 @@ $lang['New tag'] = '新しいタグ';
 $lang['Number of comments per page'] = '1ページあたりのコメント数';
 $lang['Number of rates'] = '評価数';
 $lang['Number of thumbnails to create'] = '作成サムネイル数';
-$lang['Only private categories are listed'] = 'プライベートカテゴリのみ表示されています。';
+$lang['Only private albums are listed'] = 'プライベートカテゴリのみ表示されています。';
 $lang['Operating system'] = 'オペレーティングシステム';
 $lang['Options'] = 'オプション';
-$lang['Other private categories'] = '他のプライベートカテゴリ';
+$lang['Other private albums'] = '他のプライベートカテゴリ';
 $lang['Page banner'] = 'ページバナー';
 $lang['Parent album'] = '親カテゴリ';
 $lang['Path'] = 'パス';
 $lang['Permalink'] = 'パーマリンク';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'パーマリンク %s は、すでにカテゴリ %s で使用されています。最初にパーマリンク履歴を削除してください。';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'パーマリンク %s は、すでにカテゴリ %s で使用されています。最初にパーマリンク履歴を削除してください。';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'パーマリンク名は、a-z、A-Z、0-9、「-」、「_」、「/」で構成される必要があります。数字または「-」が続く数字を使用することはできません。';
-$lang['Permalink %s is already used by category %s'] = 'パーマリンク %s は、すでにカテゴリ %s で使用されています。';
+$lang['Permalink %s is already used by album %s'] = 'パーマリンク %s は、すでにカテゴリ %s で使用されています。';
 $lang['Permalink history'] = 'パーマリンク履歴';
 $lang['Permalinks'] = 'パーマリンク';
 $lang['Permission denied'] = 'パーミッション拒否';
@@ -151,7 +150,7 @@ $lang['Rating'] = '評価';
 $lang['Reject All'] = 'すべてを拒否する';
 $lang['Reject'] = '拒否';
 $lang['Representant'] = '見本';
-$lang['Representation of categories'] = 'カテゴリ見本';
+$lang['Representation of albums'] = 'カテゴリ見本';
 $lang['Representative'] = '見本';
 $lang['Represents'] = '表示';
 $lang['Save order'] = '表示順を保存する';
@@ -183,7 +182,7 @@ $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 album in its own sub album'] = 'あなたは、カテゴリをサブカテゴリに移動できません。';
+$lang['You cannot move an album in its own sub album'] = 'あなたは、カテゴリをサブカテゴリに移動できません。';
 $lang['You need to confirm deletion'] = 'あなたは、削除を確認する必要があります。';
 $lang['add tags'] = 'タグを追加する';
 $lang['Adviser'] = 'アドバイザ';
@@ -191,18 +190,17 @@ $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['Authorize users to add comments on selected albums'] = '選択されたカテゴリにユーザのコメント追加を許可する';
 $lang['The name of an album must not be empty'] = 'カテゴリ名は空白にしないでください。';
 $lang['Lock albums'] = 'カテゴリをロックする';
 $lang['Private'] = 'プライベートカテゴリ';
 $lang['Public'] = 'パブリックカテゴリ';
 $lang['Find a new representant by random'] = '新しい見本をランダムに探す';
 $lang['Public / Private'] = 'パブリック / プライベート';
-$lang['Manage authorizations for selected categories'] = '選択したカテゴリの権限を管理する';
-$lang['Select uploadable categories'] = 'アップロード可能なカテゴリを選択する';
+$lang['Manage authorizations for selected albums'] = '選択したカテゴリの権限を管理する';
+$lang['Select uploadable albums'] = 'アップロード可能なカテゴリを選択する';
 $lang['Virtual album added'] = 'バーチャルカテゴリが追加されました。';
 $lang['Virtual album deleted'] = 'バーチャルカテゴリが削除されました。';
-$lang['Category'] = 'カテゴリ';
 $lang['Access type'] = 'アクセスタイプ';
 $lang['Comments'] = 'コメント';
 $lang['Information data registered in database'] = 'データベースに登録された情報データ';
@@ -356,10 +354,10 @@ $lang['synchronize metadata'] = 'メタデータを同期化する';
 $lang['target'] = 'ターゲット';
 $lang['Thumbnail'] = 'サムネイル';
 $lang['title'] = 'タイトル';
-$lang['Categories management'] = 'カテゴリ管理';
+$lang['Album list management'] = 'カテゴリ管理';
 $lang['Piwigo configuration'] = 'Piwigo設定';
 $lang['Piwigo administration'] = 'Piwigo管理';
-$lang['Edit a category'] = 'カテゴリを編集する';
+$lang['Edit album'] = 'カテゴリを編集する';
 $lang['Group management'] = 'グループ管理';
 $lang['User list'] = 'ユーザリスト';
 $lang['Modify informations about a picture'] = '写真情報を修正する';
@@ -390,9 +388,9 @@ $lang['unset'] = '設定解除';
 $lang['Update albums informations'] = 'カテゴリ情報を更新する';
 $lang['Update images informations'] = 'イメージ情報を更新する';
 $lang['Synchronize'] = '同期化';
-$lang['reduce to single existing categories'] = '既存の単一カテゴリに減らす';
+$lang['reduce to single existing albums'] = '既存の単一カテゴリに減らす';
 $lang['Choose an option'] = 'オプションの選択';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = '最大限の情報を表示する (追加されたカテゴリおよびエレメント、削除されたカテゴリおよびエレメント)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = '最大限の情報を表示する (追加されたカテゴリおよびエレメント、削除されたカテゴリおよびエレメント)';
 $lang['Piwigo version differs on the remote site'] = 'リモートサイトのPiwigoバージョンと異なります。';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'リモートサイトのcreate_listing_file.phpおよびPiwigoは、同一である必要があります。';
 $lang['listing.xml file was not found'] = 'listing.xmlファイルが見つかりませんでした。';
@@ -404,12 +402,12 @@ $lang['File/directory read error'] = 'ファイル/ディレクトリ読み込�
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'ファイルまたはディレクトリにアクセスできません (存在していないか、アクセスが拒否されています)。';
 $lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = '写真ファイルタイプでは、サムネイルを必要とします。サムネイルは、カテゴリディレクトリのサブディレクトリ「thumbnail」に入れる必要があります。サムネイルのファイル名は、設定したサムネイル接頭辞で始まる必要があります。また、拡張子は次のリストにある拡張子を使用してください:';
 $lang['missing thumbnail'] = 'サムネイルがありません。';
-$lang['categories deleted in the database'] = 'カテゴリがデータベースから削除されました。';
+$lang['albums deleted in the database'] = 'カテゴリがデータベースから削除されました。';
 $lang['elements deleted in the database'] = 'エレメントがデータベースから削除されました。';
 $lang['images candidates for metadata synchronization'] = 'メタデータ同期化候補のイメージ';
 $lang['elements informations synchronized with files metadata'] = 'ファイルメタデータに同期化されたエレメント情報';
 $lang['errors during synchronization'] = '同期化中にエラーが発生しました。';
-$lang['categories added in the database'] = 'カテゴリがデータベースに追加されました。';
+$lang['albums added in the database'] = 'カテゴリがデータベースに追加されました。';
 $lang['elements added in the database'] = 'データベースにエレメントが追加されました。';
 $lang['elements updated in the database'] = 'データベースのエレメントが更新されました。';
 $lang['Search for new images in the directories'] = 'ディレクトリ内の新しいイメージを検索する';
@@ -441,7 +439,7 @@ $lang['Toggle \'default group\' property'] = '「デフォルトグループ」�
 $lang['Advanced features'] = '高度な機能';
 $lang['Not linked elements'] = '未リンクのエレメント';
 $lang['Specials'] = '特別';
-$lang['Files with same name in more than one physical category'] = '1つ以上の物理カテゴリに存在する同一名ファイル';
+$lang['Files with same name in more than one physical album'] = '1つ以上の物理カテゴリに存在する同一名ファイル';
 
 $lang['Overall'] = '全体';
 $lang['Year'] = '年';
@@ -590,7 +588,7 @@ $lang['Templates configuration has been recorded.'] = 'テンプレート設定�
 $lang['All optimizations have been successfully completed.'] = 'すべての最適化が正常に完了しました。';
 $lang['Optimizations have been completed with some errors.'] = 'いくつかのエラーを含んで最適化が完了しました。';
 $lang['Modify information'] = '情報を修正する';
-$lang['edit category informations'] = 'カテゴリ情報を編集する';
+$lang['edit album'] = 'カテゴリ情報を編集する';
 $lang['nothing'] = 'なし';
 $lang['overrides existing values with empty ones'] = '既存の値を空白にする';
 $lang['manage image ranks'] = 'イメージランクを管理する';
@@ -639,18 +637,18 @@ $lang['Forbid this theme to users'] = 'ユーザーにこのテーマを禁止�
 $lang['Set as default theme for unregistered and new users'] = '新しいユーザーや登録されてないユーザーにデフォルト・テーマを設定する';
 $lang['unknown'] = '不明';
 $lang['Upload Photos'] = '写真をアップロードする';
-$lang['Drop into category'] = 'カテゴリーに入れる';
+$lang['Drop into album'] = 'カテゴリーに入れる';
 $lang['+ Add an upload box'] = '+ アップロード・ボックスを追加する';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = ' Piwigoにインストールされている場所の"%s" というディレクトリーに作成してください。';
 $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['existing album'] = '存在しているカテゴリー';
+$lang['create a new album'] = '新しいカテゴリーを作成する';
 $lang['Album name'] = 'カテゴリー名';
-$lang['Category "%s" has been added'] = '"%s"のカテゴリーは追加された';
+$lang['Album "%s" has been added'] = '"%s"のカテゴリーは追加された';
 $lang['Uploaded Photos'] = 'アップロードされた写真';
 $lang['%d photos uploaded'] = '%d 枚の写真がアップロードされた';
 $lang['Privacy level set to "%s"'] = 'プライバシー設定: "%s"';
-$lang['Category "%s" now contains %d photos'] = 'カテゴリー "%s" は現在　%d 枚の写真があります。';
+$lang['Album "%s" now contains %d photos'] = 'カテゴリー "%s" は現在　%d 枚の写真があります。';
 $lang['Manage this set of %d photos'] = ' %d 枚の写真を管理する';
 $lang['Select files'] = 'ファイルを選択する';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEGファイル又は、ZIPファイルフォーマットに入っているJPEGファイル下さい。';
diff --git a/language/ja_JP/common.lang.php b/language/ja_JP/common.lang.php
index e8b1600fb..da6a153bc 100644
--- a/language/ja_JP/common.lang.php
+++ b/language/ja_JP/common.lang.php
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = '少なくともリスト
 $lang['At least one tag must match'] = '少なくとも1つのタグが合致する必要があります。';
 $lang['Author'] = '撮影者';
 $lang['Average rate'] = '平均評価';
-$lang['Categories'] = 'カテゴリ';
-$lang['Category'] = 'カテゴリ';
+$lang['Albums'] = 'カテゴリ';
+$lang['Album'] = 'カテゴリ';
 $lang['Close this window'] = 'このウィンドウを閉じる';
 $lang['Complete RSS feed (images, comments)'] = '完全なRSSフィード (イメージ、コメント)';
 $lang['Confirm Password'] = 'パスワードをもう一度';
diff --git a/language/ka_GE/admin.lang.php b/language/ka_GE/admin.lang.php
index b34203b76..a82aeb133 100644
--- a/language/ka_GE/admin.lang.php
+++ b/language/ka_GE/admin.lang.php
@@ -59,11 +59,10 @@ $lang['Add'] = 'დავამატოთ';
 $lang['Allow user registration'] = 'დაუშვათ მომხმარებლების რეგისტრაცია';
 $lang['Apply to sub-albums'] = 'გამოვიყენოთ ქვეკატეგორიებისთვისაც';
 $lang['Associated'] = 'დაკავშირებული';
-$lang['Association to categories'] = 'დავაკავშიროთ კატეგორიებს';
 $lang['Batch management'] = 'პაკეტური დამუშავება';
 $lang['Caddie management'] = 'კალათის მართვა';
 $lang['Caddie'] = 'კალათა';
-$lang['Categories authorized thanks to group associations'] = 'კატეგორიები, რომლებიც დაშვებულია ჯგუფთან კავშირის გამო';
+$lang['Albums authorized thanks to group associations'] = 'კატეგორიები, რომლებიც დაშვებულია ჯგუფთან კავშირის გამო';
 $lang['Album manual order was saved'] = 'კატეგორიების განსაკუთრებული წყობა შენახულია';
 $lang['Album elements associated to the following albums: %s'] = 'ფოტოების კატეგორიები დაკავშირებულია შემდეგ კატეგორიებთან: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'განახლების შემოწმება უცნობი მიზეზების გამო არ შესრულდა.';
@@ -124,17 +123,17 @@ $lang['New tag'] = 'ახალი სიტყვა';
 $lang['Number of comments per page'] = 'კომენტარების რაოდენობა გვერდზე';
 $lang['Number of rates'] = 'შეფასების რაოდენობა';
 $lang['Number of thumbnails to create'] = 'შესაქმნელი ინიატურების რაოდენობა';
-$lang['Only private categories are listed'] = 'მხოლოდ დაფარული კატეგორიების ჩვენება';
+$lang['Only private albums are listed'] = 'მხოლოდ დაფარული კატეგორიების ჩვენება';
 $lang['Operating system'] = 'ოპერატიული სისტემა';
 $lang['Options'] = 'ოპციები';
-$lang['Other private categories'] = 'პრივატულ კატეგორიებთან დაშვება';
+$lang['Other private albums'] = 'პრივატულ კატეგორიებთან დაშვება';
 $lang['Page banner'] = 'წარწერა ბანერზე';
 $lang['Parent album'] = 'მშობლიური კატეგორია';
 $lang['Path'] = 'გზა';
 $lang['Permalink'] = 'მუდმივი მისამართი';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'მუდმივი მისამართი %s ადრე გამოიყენებოდა კატეგორიისთვის %s. წაშალეთ იგი მანამდე მუდმივი მისამართების ისტორიიდან';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'მუდმივი მისამართი %s ადრე გამოიყენებოდა კატეგორიისთვის %s. წაშალეთ იგი მანამდე მუდმივი მისამართების ისტორიიდან';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'მუდმივი მისამართი უნდა შედგებოდეს  a-z, A-Z, 0-9, "-" ან"_". იგი არ უნდა იყოს რიცხობრივი და არ უნდა იწყებოდეს რიცხვით "-"';
-$lang['Permalink %s is already used by category %s'] = 'მუდმივი მისამართი %s უკვე გამოიყენება კატეგორიისათვის %s';
+$lang['Permalink %s is already used by album %s'] = 'მუდმივი მისამართი %s უკვე გამოიყენება კატეგორიისათვის %s';
 $lang['Permalink history'] = 'მუდმივი მისამართების სია';
 $lang['Permalinks'] = 'მუდმივი მისამართი';
 $lang['Permission denied'] = 'დაშვება აკრძალულია';
@@ -152,7 +151,7 @@ $lang['Rating'] = 'შეფასება';
 $lang['Reject All'] = 'უარი ყველას';
 $lang['Reject'] = 'უარი';
 $lang['Representant'] = 'წარმომადგენელი';
-$lang['Representation of categories'] = 'წარმოდგენილი კატეგორიები';
+$lang['Representation of albums'] = 'წარმოდგენილი კატეგორიები';
 $lang['Representative'] = 'წარმომადგენელი';
 $lang['Represents'] = 'წარმოადგენს';
 $lang['Save order'] = 'შევინახოთ წყობა';
@@ -184,7 +183,7 @@ $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 album in its own sub album'] = 'თქვენ არ შეგიძლიათ გადააადგილოთ კატეგორია მის ქვეკატერორიაში';
+$lang['You cannot move an album in its own sub album'] = 'თქვენ არ შეგიძლიათ გადააადგილოთ კატეგორია მის ქვეკატერორიაში';
 $lang['You need to confirm deletion'] = 'თქვენ უნდა დაადასტუროთ წაშლა';
 $lang['add tags'] = 'დავამატოთ სიტყვები';
 $lang['Adviser'] = 'დამხმარე';
@@ -192,18 +191,17 @@ $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['Authorize users to add comments on selected albums'] = 'ნება დავრთოთ მომხმარებლებს დაამატონ კომენტარები არჩეულ კატეგორიებს';
 $lang['The name of an album must not be empty'] = 'კატეგორიის სახელი ცარიელი არ უნდა იყოს';
 $lang['Lock albums'] = 'დავბლოკოთ კატეგორიები';
 $lang['Private'] = 'პირადი(პრივატული) კატეგორია';
 $lang['Public'] = 'საერთო კატეგორია';
 $lang['Find a new representant by random'] = 'ვიპოვოტ ახალი წარმომადგენელი შემთხვევითი მეთოდით';
 $lang['Public / Private'] = 'საერთო / პრივატული';
-$lang['Manage authorizations for selected categories'] = 'ავტორიზაციის მართვა არჩეული კატეგორიებისათვის';
-$lang['Select uploadable categories'] = 'კატეგორიის არჩევა რომელშიც შესაძლებელია ატვირთვა';
+$lang['Manage authorizations for selected albums'] = 'ავტორიზაციის მართვა არჩეული კატეგორიებისათვის';
+$lang['Select uploadable albums'] = 'კატეგორიის არჩევა რომელშიც შესაძლებელია ატვირთვა';
 $lang['Virtual album added'] = 'ვირტუალური კატეგორია დამატებულია';
 $lang['Virtual album deleted'] = 'ვირტუალური კატეგორია წაშლილია';
-$lang['Category'] = 'კატეგორია';
 $lang['Access type'] = 'დაშვების ტიპი';
 $lang['Comments'] = 'კომენტარები';
 $lang['Information data registered in database'] = 'ინფორმაცია დარეგისტრირებულია მონაცემთა ბაზაში';
@@ -360,10 +358,10 @@ $lang['synchronize'] = 'სინქრონიზაცია';
 $lang['target'] = 'შევცვალოთ';
 $lang['Thumbnail'] = 'მინიატურა';
 $lang['title'] = 'სათაური';
-$lang['Categories management'] = 'კატეგორიების მართვა';
+$lang['Album list management'] = 'კატეგორიების მართვა';
 $lang['Piwigo configuration'] = ' PhpWebGallery მართვა';
 $lang['Piwigo administration'] = 'PhpWebGallery ადმინისტრირება';
-$lang['Edit a category'] = 'კატეგორიების რედაქტირება';
+$lang['Edit album'] = 'კატეგორიების რედაქტირება';
 $lang['Group management'] = 'ჯგუფების მართვა';
 $lang['User list'] = 'მომხმარებლების სია';
 $lang['Modify informations about a picture'] = 'შევცვალოთ ინფორმაცია ფოტოზე';
@@ -394,9 +392,9 @@ $lang['unset'] = 'გავასუფთაოთ';
 $lang['Update albums informations'] = 'განვაახლოთ ინფორმაცია კატეგორიებზე';
 $lang['Update images informations'] = 'განვაახლოთ ინფორმაცია ფოტოებზე';
 $lang['Synchronize'] = 'სინქრონიზაცია';
-$lang['reduce to single existing categories'] = 'შევამოწმოთ მხოლოდ კატეგორია';
+$lang['reduce to single existing albums'] = 'შევამოწმოთ მხოლოდ კატეგორია';
 $lang['Choose an option'] = 'აირჩიეთ პარამეტრები';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = 'ვნახოთ ინფორმაციის მაქსიმუმი (დამატებული კატეგორიები და ფოტოები, წაშლილი ფოტოები და ელემენტები)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = 'ვნახოთ ინფორმაციის მაქსიმუმი (დამატებული კატეგორიები და ფოტოები, წაშლილი ფოტოები და ელემენტები)';
 $lang['Piwigo version differs on the remote site'] = 'PhpWebGallery ვერსია განსხვავდება დაშორებულ სერვერზე';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'ვერსიები create_listing_file.php დაშორებულ სერვერზე და PhpWebGallery უნდა იყოს ერთი და იგივე';
 $lang['listing.xml file was not found'] = 'ფაილი listing.xml არ მოიძებნა';
@@ -408,12 +406,12 @@ $lang['File/directory read error'] = 'შეცდომია ფაილი�
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'ფაილთან ან ფოლდერთან დაკავშირება არ მოხერხდა.(შესაძლებელია არ გაქვთ დაშვების უფლება ან მათთან დაშვება აკრძალულია)';
 $lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'ფაილის ამ ტიპისათვის საჭიროა მინიატურა.მინიატურები უნდა განათავსოთ ქვეფოლდერში  "thumbnail" კატეგორიის ფოლდერში. მინიატურის ფაილის სახელი უნდა იწყებოდეს კონფიგურაციის დროს მითითებული პრეფიქსით,ხოლო მისი გაფართოება უნდა იყოს ერთ-ერთი ქვემოთ ჩამოთვლილთაგან:';
 $lang['missing thumbnail'] = 'მინიატურები არ არის';
-$lang['categories deleted in the database'] = 'კატეგორია წაშლილია მონაცემთა ბაზიდან';
+$lang['albums deleted in the database'] = 'კატეგორია წაშლილია მონაცემთა ბაზიდან';
 $lang['elements deleted in the database'] = 'ელემენტი წაშლილია მონაცემთა ბაზიდან';
 $lang['images candidates for metadata synchronization'] = 'სურათი მეტამონაცემების სინქრონიზაციისათვის';
 $lang['elements informations synchronized with files metadata'] = 'ინფორმაცია ელემენტებზე სინქრონირებულია ფაილების მეტამონაცემებთან';
 $lang['errors during synchronization'] = 'სინქრონიზაციის შეცდომები';
-$lang['categories added in the database'] = 'კატეგორიები დამატებულია მონაცემთა ბაზაში';
+$lang['albums added in the database'] = 'კატეგორიები დამატებულია მონაცემთა ბაზაში';
 $lang['elements added in the database'] = 'ელემენტები დამატებულია მონაცემთა ბაზაში';
 $lang['elements updated in the database'] = 'ელემანტები განახლებულია მონაცემთა ბაზაში';
 $lang['Search for new images in the directories'] = 'ახალი ფოტოების ძებნა პაპკებში';
@@ -446,7 +444,7 @@ $lang['Toggle \'default group\' property'] = 'შევქმათ/მოვა
 $lang['Advanced features'] = 'გაფართოებული ფუნქციები';
 $lang['Not linked elements'] = 'მიუმაგრებელი ელემენტები';
 $lang['Specials'] = 'სპეც ფუნქციები';
-$lang['Files with same name in more than one physical category'] = 'ფაილები ერთნაირი სახელით სხვა და სხვა ფოლდერში';
+$lang['Files with same name in more than one physical album'] = 'ფაილები ერთნაირი სახელით სხვა და სხვა ფოლდერში';
 
 $lang['Overall'] = 'ყველა';
 $lang['Year'] = 'წელი';
@@ -599,7 +597,7 @@ $lang['Templates configuration has been recorded.'] = 'თარგების
 $lang['All optimizations have been successfully completed.'] = 'ყველა ოპტიმიზაციამ წარმატებით ჩაიარა.';
 $lang['Optimizations have been completed with some errors.'] = 'ოპტიმიზაცია დასრულდა შეცდომებით.';
 $lang['Modify information'] = 'Modify information';
-$lang['edit category informations'] = 'კატეგორიის რედაქტირება';
+$lang['edit album'] = 'კატეგორიის რედაქტირება';
 $lang['nothing'] = 'არაფერი';
 $lang['overrides existing values with empty ones'] = 'შევცვალოთ არსებული მნიშვნელობები ცარიელით';
 $lang['manage image ranks'] = 'ფოტოების მართვის წესი';
@@ -649,18 +647,18 @@ $lang['Forbid this theme to users'] = 'აუკრზალოთ მომხ�
 $lang['Set as default theme for unregistered and new users'] = 'დავაყენოთ ეს თემა ახალი და დაურეგისტრირებელი მომხმარებელისათვის ძირითადად';
 $lang['unknown'] = 'უცნობია';
 $lang['Upload Photos'] = 'ავტვირთოთ ფოტოები';
-$lang['Drop into category'] = 'ავტვირთოთ კატეგორიაში';
+$lang['Drop into album'] = 'ავტვირთოთ კატეგორიაში';
 $lang['+ Add an upload box'] = '+ დავამატოთ ასატვირთი ველი';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'შექმენით "%s" კატალოგი თქვენს მიერ დაყენებული Piwigo-ს ფუძეში';
 $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['existing album'] = 'არსებული კატეგორია';
+$lang['create a new album'] = 'შევქმნათ ახალი კატეგორია';
 $lang['Album name'] = 'კატეგორიის სახელი';
-$lang['Category "%s" has been added'] = 'კატეგორია "%s" დამატებულია';
+$lang['Album "%s" has been added'] = 'კატეგორია "%s" დამატებულია';
 $lang['Uploaded Photos'] = 'ატვირთული ფოტოები';
 $lang['%d photos uploaded'] = '%d ფოტოები ატვირთულია';
 $lang['Privacy level set to "%s"'] = 'დავაყენოთ დაშვების უფლება "%s"';
-$lang['Category "%s" now contains %d photos'] = 'კატეგორია "%s" შეიცავს ამჟამად %d ფოტოს';
+$lang['Album "%s" now contains %d photos'] = 'კატეგორია "%s" შეიცავს ამჟამად %d ფოტოს';
 $lang['Manage this set of %d photos'] = 'ამ კრებულის რედაქტირება, შემცველობით %d Fოტო';
 $lang['Select files'] = 'ავირჩიოთ ფაილები';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG ფაილები ან ZIP არქივი JPEG ფაილებით შიგნით.';
diff --git a/language/ka_GE/common.lang.php b/language/ka_GE/common.lang.php
index 22deecc86..1a462f89b 100644
--- a/language/ka_GE/common.lang.php
+++ b/language/ka_GE/common.lang.php
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = 'ერთი წეს�
 $lang['At least one tag must match'] = 'ერთი სიტყვა მაინც უნდა იყოს';
 $lang['Author'] = 'ავტორი';
 $lang['Average rate'] = 'საშუალო ქულა';
-$lang['Categories'] = 'გალერეა';
-$lang['Category'] = 'გალერეა';
+$lang['Albums'] = 'გალერეა';
+$lang['Album'] = 'გალერეა';
 $lang['Close this window'] = 'დავხუროთ ეს ფანჯარა';
 $lang['Complete RSS feed (images, comments)'] = 'სრული RSS ლენტა (ფოტოები, კომენტარები)';
 $lang['Confirm Password'] = 'გაიმეორეთ პაროლი';
diff --git a/language/mk_MK/common.lang.php b/language/mk_MK/common.lang.php
index 462f364ac..3d6e8b535 100644
--- a/language/mk_MK/common.lang.php
+++ b/language/mk_MK/common.lang.php
@@ -61,8 +61,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Барем едно пр
 $lang['At least one tag must match'] = 'Барем една етикета треба да одговара.';
 $lang['Author'] = 'Автор';
 $lang['Average rate'] = 'Просек';
-$lang['Categories'] = 'Категории';
-$lang['Category'] = 'Категорија';
+$lang['Albums'] = 'Категории';
+$lang['Album'] = 'Категорија';
 $lang['Close this window'] = 'Затвори го овој прозор';
 $lang['Complete RSS feed (images, comments)'] = 'Комплетен RSS feed (фотографии и коментари)';
 $lang['Confirm Password'] = 'Потврдете ја лозинката';
diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php
index d3b89aaee..d7b511b77 100644
--- a/language/nl_NL/admin.lang.php
+++ b/language/nl_NL/admin.lang.php
@@ -59,11 +59,10 @@ $lang['Add'] = 'Toevoegen';
 $lang['Allow user registration'] = 'Sta gebruikersregistratie toe';
 $lang['Apply to sub-albums'] = 'Toestaan op sub-categorieën';
 $lang['Associated'] = 'Gelinkt';
-$lang['Association to categories'] = 'Gelinkt aan categorie';
 $lang['Batch management'] = 'Batch management';
 $lang['Caddie management'] = 'Winkelmandje management';
 $lang['Caddie'] = 'Winkelmandje';
-$lang['Categories authorized thanks to group associations'] = 'Categorieën geautoriseerd dankzij groepassociaties';
+$lang['Albums authorized thanks to group associations'] = 'Categorieën geautoriseerd dankzij groepassociaties';
 $lang['Album manual order was saved'] = 'Categorieën handmatig gesorteerd is opgeslagen';
 $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.';
@@ -123,17 +122,17 @@ $lang['New tag'] = 'Nieuwe tag';
 $lang['Number of comments per page'] = 'Aantal weer te geven commentaren per pagina';
 $lang['Number of rates'] = 'Aantal waarderingen';
 $lang['Number of thumbnails to create'] = 'Aantal mini-afbeeldingen om te maken';
-$lang['Only private categories are listed'] = 'Alleen privé categorieën worden getoond';
+$lang['Only private albums are listed'] = 'Alleen privé categorieën worden getoond';
 $lang['Operating system'] = 'Besturingssysteem';
 $lang['Options'] = 'Opties';
-$lang['Other private categories'] = 'Andere privé categorieën';
+$lang['Other private albums'] = 'Andere privé categorieën';
 $lang['Page banner'] = 'Pagina banner';
 $lang['Parent album'] = 'Hoofdcategorie';
 $lang['Path'] = 'Pad';
 $lang['Permalink'] = 'Permalink';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'Permalink %s is eerder gebruikt door categorie %s. Verwijder de permalink geschiedenis eerst';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'Permalink %s is eerder gebruikt door categorie %s. Verwijder de permalink geschiedenis eerst';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'De permalinknaam moet bestaan uit a-z, A-Z, 0-9, "-" of "_". Het mag geen getal zijn of starten met een "-"';
-$lang['Permalink %s is already used by category %s'] = 'Permalink %s is al in gebruik door categorie %s';
+$lang['Permalink %s is already used by album %s'] = 'Permalink %s is al in gebruik door categorie %s';
 $lang['Permalink history'] = 'Permalink geschiedenis';
 $lang['Permalinks'] = 'Permalinks';
 $lang['Permission denied'] = 'Toegang gewijgerd';
@@ -151,7 +150,7 @@ $lang['Rating'] = 'Waardering';
 $lang['Reject All'] = 'Alles afwijzen';
 $lang['Reject'] = 'Afwijzen';
 $lang['Representant'] = 'Representant';
-$lang['Representation of categories'] = 'Representatieve categorieën';
+$lang['Representation of albums'] = 'Representatieve categorieën';
 $lang['Representative'] = 'Representatief';
 $lang['Represents'] = 'Representeerd';
 $lang['Save order'] = 'Bewaar sortering';
@@ -184,7 +183,7 @@ $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 album in its own sub album'] = 'U kunt een categorie niet verplaatsen naar zijn eigen sub-categorie';
+$lang['You cannot move an 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';
@@ -192,18 +191,17 @@ $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['Authorize users to add comments on selected albums'] = 'Selecteer categorieën waarop commentaar gegeven mag worden';
 $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';
 $lang['Find a new representant by random'] = 'Vindt een willekeurige nieuwe representant';
 $lang['Public / Private'] = 'Openbaar / Privé';
-$lang['Manage authorizations for selected categories'] = 'Beheer toegang voor geselecteerde categorieën';
-$lang['Select uploadable categories'] = 'Selecteer categorieën waarnaar geupload mag worden';
+$lang['Manage authorizations for selected albums'] = 'Beheer toegang voor geselecteerde categorieën';
+$lang['Select uploadable albums'] = 'Selecteer categorieën waarnaar geupload mag worden';
 $lang['Virtual album added'] = 'Virtuele categorie toegevoegd';
 $lang['Virtual album deleted'] = 'Virtuele categorie verwijderd';
-$lang['Category'] = 'Categorie';
 $lang['Access type'] = 'Toegangstype';
 $lang['Comments'] = 'Commentaar';
 $lang['Information data registered in database'] = 'Informatie opgeslagen in de database';
@@ -356,10 +354,10 @@ $lang['synchronize metadata'] = 'synchroniseer metadata';
 $lang['target'] = 'Doel';
 $lang['Thumbnail'] = 'Mini-afbeelding';
 $lang['title'] = 'Titel';
-$lang['Categories management'] = 'Categorie beheer';
+$lang['Album list management'] = 'Categorie beheer';
 $lang['Piwigo configuration'] = 'Piwigo configuratie';
 $lang['Piwigo administration'] = 'Piwigo beheer';
-$lang['Edit a category'] = 'Bewerk een categorie';
+$lang['Edit album'] = 'Bewerk een categorie';
 $lang['Group management'] = 'Groepsbeheer';
 $lang['User list'] = 'Gebruikerslijst';
 $lang['Modify informations about a picture'] = 'Verander de informatie van een plaatje';
@@ -390,9 +388,9 @@ $lang['unset'] = 'Niet ingesteld';
 $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';
+$lang['reduce to single existing albums'] = 'Alleen naar de bestaande categorieën terugbrengen';
 $lang['Choose an option'] = 'Kies een optie';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = 'toon maximale informatie (toegevoegde categorieën en afbeeldingen, verwijderde categorieën en afbeeldingen)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = 'toon maximale informatie (toegevoegde categorieën en afbeeldingen, verwijderde categorieën en afbeeldingen)';
 $lang['Piwigo version differs on the remote site'] = 'Piwigo versie verschilt op de remote site';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'Versie van create_listing_file.php op de remote site en Piwigo moeten gelijk zijn';
 $lang['listing.xml file was not found'] = 'listing.xml file is niet gevonden';
@@ -404,12 +402,12 @@ $lang['File/directory read error'] = 'Bestand/map lees fout';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'Het bestand of map kan niet worden benaderd (of het bestand of map bestaat niet of heeft geen rechten)';
 $lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'Een afbeelding heeft een mini-afbeelding nodig. De mini-afbeelding moet in de subdirectorie "thumbnail" van de betreffende categorie aanwezig zijn. De mini-afbeelding moet starten met het in de configuratie opgegeven voorvoegsel (prefix) en mag alleen een extentie bevatten die voorkomt in de volgende lijst:';
 $lang['missing thumbnail'] = 'ontbrekende mini-afbeelding';
-$lang['categories deleted in the database'] = 'categorieën verwijderd uit de database';
+$lang['albums deleted in the database'] = 'categorieën verwijderd uit de database';
 $lang['elements deleted in the database'] = 'afbeeldingen verwijderd uit de database';
 $lang['images candidates for metadata synchronization'] = 'afbeeldingen gesynchroniseerd met de metadata van de bijbehorende bestanden';
 $lang['elements informations synchronized with files metadata'] = 'afbeeldings-informatie gesynchroniseerd met bestandsmetadata';
 $lang['errors during synchronization'] = 'fouten tijdens synchronisatie';
-$lang['categories added in the database'] = 'categorieën toegevoegd aan de database';
+$lang['albums added in the database'] = 'categorieën toegevoegd aan de database';
 $lang['elements added in the database'] = 'afbeeldingen toegevoegd aan de database';
 $lang['elements updated in the database'] = 'afbeeldingen bijgewerkt in de database';
 $lang['Search for new images in the directories'] = 'Zoek naar nieuwe afbeeldingen in mappen';
@@ -441,7 +439,7 @@ $lang['Toggle \'default group\' property'] = 'Wissel \'standaard groep\' instell
 $lang['Advanced features'] = 'Geavanceerde functies';
 $lang['Not linked elements'] = 'Niet gelinkte afbeeldingen';
 $lang['Specials'] = 'Speciaal';
-$lang['Files with same name in more than one physical category'] = 'Bestanden met dezelfde naam in meer dan één fysieke categorie';
+$lang['Files with same name in more than one physical album'] = 'Bestanden met dezelfde naam in meer dan één fysieke categorie';
 $lang['Overall'] = 'Totaal';
 $lang['Year'] = 'Jaar';
 $lang['Month'] = 'Maand';
@@ -587,7 +585,7 @@ $lang['Templates configuration has been recorded.'] = 'Sjabloon configuratie is
 $lang['All optimizations have been successfully completed.'] = 'Alle verbeteringen zijn succesvol afgerond.';
 $lang['Optimizations have been completed with some errors.'] = 'Verbeteringen zijn afgerond met enkele fouten.';
 $lang['Modify information'] = 'Aanpassen informatie';
-$lang['edit category informations'] = 'Bewerk categorie-informatie';
+$lang['edit album'] = 'Bewerk categorie-informatie';
 $lang['nothing'] = 'niets';
 $lang['overrides existing values with empty ones'] = 'overschrijft de bestaande waarden met lege waardes';
 $lang['Drag to re-order'] = 'Sleep om volgorde te veranderen';
@@ -636,18 +634,18 @@ $lang['Forbid this theme to users'] = 'Dit thema mag niet door gebruikers gebrui
 $lang['Set as default theme for unregistered and new users'] = 'Standaard thema voor niet geregisteerde and nieuwe gebruikers';
 $lang['unknown'] = 'onbekend';
 $lang['Upload Photos'] = 'Upload Foto\'s';
-$lang['Drop into category'] = 'Toevoegen aan categorie';
+$lang['Drop into album'] = 'Toevoegen aan categorie';
 $lang['+ Add an upload box'] = 'Voeg een upload-fregel toe';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Maak de "%s" directory aan vanuit de root van uw Piwigo-installatie';
 $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['existing album'] = 'Bestaande categorie';
+$lang['create a new album'] = 'Maak een nieuwe categorie aan';
 $lang['Album name'] = 'Categorienaam';
-$lang['Category "%s" has been added'] = 'Categorie "%s" is toegevoegd';
+$lang['Album "%s" has been added'] = 'Categorie "%s" is toegevoegd';
 $lang['Uploaded Photos'] = 'Ge-uploade Foto\'s';
 $lang['%d photos uploaded'] = '%d foto\'s ge-uploaded';
 $lang['Privacy level set to "%s"'] = 'Privacy-niveau staat nu op "%s"';
-$lang['Category "%s" now contains %d photos'] = 'Categorie "%s" bevat nu %d foto\'s';
+$lang['Album "%s" now contains %d photos'] = 'Categorie "%s" bevat nu %d foto\'s';
 $lang['Manage this set of %d photos'] = 'Beheer deze reeks van %d foto\'s';
 $lang['Select files'] = 'Selecteer bestanden';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG bestanden of ZIP bestanden die JPEG bestanden bevatten aub.';
diff --git a/language/nl_NL/common.lang.php b/language/nl_NL/common.lang.php
index 7944da692..bd8426426 100644
--- a/language/nl_NL/common.lang.php
+++ b/language/nl_NL/common.lang.php
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Op zijn minst moet aan �
 $lang['At least one tag must match'] = 'Op zijn minst moet een tag kloppen';
 $lang['Author'] = 'Maker';
 $lang['Average rate'] = 'Gemiddelde waardering';
-$lang['Categories'] = 'Categorieën';
-$lang['Category'] = 'Categorie';
+$lang['Albums'] = 'Categorieën';
+$lang['Album'] = 'Categorie';
 $lang['Close this window'] = 'Sluit dit venster';
 $lang['Complete RSS feed (images, comments)'] = 'Complete RSS feed (afbeeldingen, commentaar)';
 $lang['Confirm Password'] = 'Bevestig wachtwoord';
diff --git a/language/pl_PL/admin.lang.php b/language/pl_PL/admin.lang.php
index 6ba392096..0d89d337a 100644
--- a/language/pl_PL/admin.lang.php
+++ b/language/pl_PL/admin.lang.php
@@ -59,11 +59,10 @@ $lang['Add'] = 'Dodaj';
 $lang['Allow user registration'] = 'Zezwól na rejestrację użytkowników';
 $lang['Apply to sub-albums'] = 'Zastosuj do podkategorii';
 $lang['Associated'] = 'Powiązane';
-$lang['Association to categories'] = 'Powiązania do kategorii';
 $lang['Batch management'] = 'Zarządzanie batch';
 $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['Albums 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['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.';
@@ -123,17 +122,17 @@ $lang['New tag'] = 'Nowy tag';
 $lang['Number of comments per page'] = 'Liczba komentarzy na stronę';
 $lang['Number of rates'] = 'Liczba ocen';
 $lang['Number of thumbnails to create'] = 'Liczba miniatru do stworzenia';
-$lang['Only private categories are listed'] = 'Tylko prywatne kategorie zostały wyświetlone';
+$lang['Only private albums are listed'] = 'Tylko prywatne kategorie zostały wyświetlone';
 $lang['Operating system'] = 'System operacyjny';
 $lang['Options'] = 'Opcje';
-$lang['Other private categories'] = 'Inne kategorie prywatne';
+$lang['Other private albums'] = 'Inne kategorie prywatne';
 $lang['Page banner'] = 'Banner strony';
 $lang['Parent album'] = 'Nadrzędna kategoria';
 $lang['Path'] = 'Ścieżka';
 $lang['Permalink'] = 'Link permanentny';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'Link permanentny %s został poprzednio wykorzystany przez %s. Najpierw usuń link z historii';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'Link permanentny %s został poprzednio wykorzystany przez %s. Najpierw usuń link z historii';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'Nzawa linku permanentnego musi składać się z następujących znaków a-z, A-Z, 0-9, "-", "_" lub "/". Nie może być cyfrą lub zaczynać się od "-"';
-$lang['Permalink %s is already used by category %s'] = 'Link permanentny %s jest już używany przez kategorię %s';
+$lang['Permalink %s is already used by album %s'] = 'Link permanentny %s jest już używany przez kategorię %s';
 $lang['Permalink history'] = 'Historia linków permanentnych';
 $lang['Permalinks'] = 'Linki permanentne';
 $lang['Permission denied'] = 'Dostęp zabroniony';
@@ -151,7 +150,7 @@ $lang['Rating'] = 'Oceny';
 $lang['Reject All'] = 'Odrzuć wszystkie';
 $lang['Reject'] = 'Odrzuć';
 $lang['Representant'] = 'Reprezentant';
-$lang['Representation of categories'] = 'Representacja kategorii';
+$lang['Representation of albums'] = 'Representacja kategorii';
 $lang['Representative'] = 'Representacyjny';
 $lang['Represents'] = 'Representuje';
 $lang['Save order'] = 'Zapisz kolejność';
@@ -183,7 +182,7 @@ $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 album in its own sub album'] = 'Nie możnesz przenieść kategorii do jej własnej podkategorii';
+$lang['You cannot move an 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';
@@ -191,18 +190,17 @@ $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['Authorize users to add comments on selected albums'] = 'Autoryzuj użytkowników by mogli dodawać komentarze do wybranych kategorii';
 $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';
 $lang['Find a new representant by random'] = 'Znajdź losowo nowego reprezentanta';
 $lang['Public / Private'] = 'Publiczne / Prywatne';
-$lang['Manage authorizations for selected categories'] = 'Zarządzaj autoryzacjami dla wybranych kategorii';
-$lang['Select uploadable categories'] = 'Zaznacz kategorie, do których można wgrywać';
+$lang['Manage authorizations for selected albums'] = 'Zarządzaj autoryzacjami dla wybranych kategorii';
+$lang['Select uploadable albums'] = 'Zaznacz kategorie, do których można wgrywać';
 $lang['Virtual album added'] = 'Dodano wirtualną kategorię';
 $lang['Virtual album deleted'] = 'Usunięto wirtualną kategorię';
-$lang['Category'] = 'kategoria';
 $lang['Access type'] = 'Typ dostępu';
 $lang['Comments'] = 'Komentarze';
 $lang['Information data registered in database'] = 'Dane zapisane w bazie danych';
@@ -356,10 +354,10 @@ $lang['synchronize metadata'] = 'synchronizuj metadane';
 $lang['target'] = 'cel';
 $lang['Thumbnail'] = 'miniatura';
 $lang['title'] = 'tytuł';
-$lang['Categories management'] = 'Zarządzanie kategoriami';
+$lang['Album list management'] = 'Zarządzanie kategoriami';
 $lang['Piwigo configuration'] = 'Konfiguracja Piwigo';
 $lang['Piwigo administration'] = 'Administracja Piwigo';
-$lang['Edit a category'] = 'Edytuj kategorię';
+$lang['Edit album'] = 'Edytuj kategorię';
 $lang['Group management'] = 'Zarządzanie grupami';
 $lang['User list'] = 'Lista użytkowników';
 $lang['Modify informations about a picture'] = 'Edytuj informacje o obrazie';
@@ -390,9 +388,9 @@ $lang['unset'] = 'nie ustawione';
 $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';
+$lang['reduce to single existing albums'] = 'zredukuj do pojedynczej istniejącej kategorii';
 $lang['Choose an option'] = 'Wybierz opcję';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = 'wyświetlaj jak dużo informacji (dodane kategorie i elementy, usunięte kategorie i elementy)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = 'wyświetlaj jak dużo informacji (dodane kategorie i elementy, usunięte kategorie i elementy)';
 $lang['Piwigo version differs on the remote site'] = 'Wersja Piwigo na zdalnej stronie jest inna';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'Wersja pliku create_listing_file.php na zdalnej stronie musi być taka sama jak w Piwigo';
 $lang['listing.xml file was not found'] = 'Nie odnaleziono pliku listing.xml';
@@ -404,12 +402,12 @@ $lang['File/directory read error'] = 'Błąd odczytu pliku/katalogu';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'Brak dostępu do pliku lub katalogu (nie istnieje lub brak uprawnień)';
 $lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'typ pliku wymaga miniatury. Miniatura musi znajdować się w podkatalogu "thumbnail" danej kategorii. Nazwa pliku z miniaturą musi zaczynać się od skonfigurowanego prefixu, a rozszerzenie pliku musi być nastepujące :';
 $lang['missing thumbnail'] = 'brakujące miniatury';
-$lang['categories deleted in the database'] = 'kategorii usuniętych z bazy danych';
+$lang['albums deleted in the database'] = 'kategorii usuniętych z bazy danych';
 $lang['elements deleted in the database'] = 'elementów usuniętych z bazy danych';
 $lang['images candidates for metadata synchronization'] = 'obrazów dla których można zsynchronizować metadane';
 $lang['elements informations synchronized with files metadata'] = 'informacji o elementach zsynchronizowanych z metadanymi plików';
 $lang['errors during synchronization'] = 'błędów podczas synchronizacji';
-$lang['categories added in the database'] = 'kategorii dodanych do bazy danych';
+$lang['albums added in the database'] = 'kategorii dodanych do bazy danych';
 $lang['elements added in the database'] = 'elementów dodanych do bazy danych';
 $lang['elements updated in the database'] = 'elementów zaktualizowanych w bazie danych';
 $lang['Search for new images in the directories'] = 'Szukaj nowych obrazów w katalogach';
@@ -441,7 +439,7 @@ $lang['Toggle \'default group\' property'] = 'Właściwości przełączania \'gr
 $lang['Advanced features'] = 'Zaawansowane';
 $lang['Not linked elements'] = 'Elementy nie przypisane';
 $lang['Specials'] = 'Specjalne';
-$lang['Files with same name in more than one physical category'] = 'Pliki o tych samych nazwach w jednej lub więcej kategoriach';
+$lang['Files with same name in more than one physical album'] = 'Pliki o tych samych nazwach w jednej lub więcej kategoriach';
 
 $lang['Overall'] = 'W sumie';
 $lang['Year'] = 'Rok';
@@ -590,7 +588,7 @@ $lang['Templates configuration has been recorded.'] = 'Konfiguracja szablonów z
 $lang['All optimizations have been successfully completed.'] = 'Wszystkie optymalizacje zakończone pomyślnie.';
 $lang['Optimizations have been completed with some errors.'] = 'Optymalizacje zakończone z kilkoma błędami.';
 $lang['Modify information'] = 'Modyfikuj informacje';
-$lang['edit category informations'] = 'edytuj informacje o kategorii';
+$lang['edit album'] = 'edytuj informacje o kategorii';
 $lang['nothing'] = 'nic';
 $lang['overrides existing values with empty ones'] = 'nadpisuje istniejące wartości pustymi';
 $lang['manage image ranks'] = 'zarządzaj rankingami obrazów';
@@ -641,18 +639,18 @@ $lang['Forbid this theme to users'] = 'Zabroć używania tego tematu przez użyt
 $lang['Set as default theme for unregistered and new users'] = 'Ustaw jako domyślny temat dla niezarejestrowanych użytkowników';
 $lang['unknown'] = 'nieznany';
 $lang['Upload Photos'] = 'Wgrywanie zdjęć';
-$lang['Drop into category'] = 'Wgraj do kategorii';
+$lang['Drop into album'] = 'Wgraj do kategorii';
 $lang['+ Add an upload box'] = '+ Dodaj skrzynki wgrywania';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Tworzy katalog "%s" w głównym katalogu Twojej instalacji Piwio';
 $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['existing album'] = 'istniejąca kategoria';
+$lang['create a new album'] = 'stwórz nową kategorię';
 $lang['Album name'] = 'Nazwa kategorii';
-$lang['Category "%s" has been added'] = 'Kategoria "%s" została dodana';
+$lang['Album "%s" has been added'] = 'Kategoria "%s" została dodana';
 $lang['Uploaded Photos'] = 'Wgrane zdjęcia';
 $lang['%d photos uploaded'] = '%d wgranych zdjęć';
 $lang['Privacy level set to "%s"'] = 'Poziom prywatności ustawiony na "%s"';
-$lang['Category "%s" now contains %d photos'] = 'Kategoria "%s" aktualnie zawiera %d zdjęć';
+$lang['Album "%s" now contains %d photos'] = 'Kategoria "%s" aktualnie zawiera %d zdjęć';
 $lang['Manage this set of %d photos'] = 'Zarządzaj tym zbiorem %d zdjęć';
 $lang['Select files'] = 'Wybierz pliki';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'Pliki JPEG lub archiwa ZIP z plikami JPEG w środku.';
diff --git a/language/pl_PL/common.lang.php b/language/pl_PL/common.lang.php
index 48d6db9b0..76746e053 100644
--- a/language/pl_PL/common.lang.php
+++ b/language/pl_PL/common.lang.php
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = 'At least one listed rule
 $lang['At least one tag must match'] = 'Przynajmniej jedentag musi pasować';
 $lang['Author'] = 'Autor';
 $lang['Average rate'] = 'Średnia ocena';
-$lang['Categories'] = 'Kategorie';
-$lang['Category'] = 'Kategoria';
+$lang['Albums'] = 'Kategorie';
+$lang['Album'] = 'Kategoria';
 $lang['Close this window'] = 'Zamknij okno';
 $lang['Complete RSS feed (images, comments)'] = 'Kompletny RSS feed (zdjęcia, komentarze)';
 $lang['Confirm Password'] = 'Potwierdź hasło';
diff --git a/language/pt_BR/admin.lang.php b/language/pt_BR/admin.lang.php
index 7d55c1671..be81ebf4f 100644
--- a/language/pt_BR/admin.lang.php
+++ b/language/pt_BR/admin.lang.php
@@ -59,11 +59,10 @@ $lang['Add'] = 'Adicionar';
 $lang['Allow user registration'] = 'Permitir o registro de usuário';
 $lang['Apply to sub-albums'] = 'Aplicar às subcategorias';
 $lang['Associated'] = 'Associados(as)';
-$lang['Association to categories'] = 'Associação a categorias';
 $lang['Batch management'] = 'Gerenciamento de arquivos de lote';
 $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['Albums 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['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.';
@@ -123,17 +122,17 @@ $lang['New tag'] = 'Tag nova';
 $lang['Number of comments per page'] = 'Número de comentários por página';
 $lang['Number of rates'] = 'Número de votos';
 $lang['Number of thumbnails to create'] = 'Número de miniaturas (thumbnails) a ser criado';
-$lang['Only private categories are listed'] = 'Apenas as categorias privadas estão listadas';
+$lang['Only private albums are listed'] = 'Apenas as categorias privadas estão listadas';
 $lang['Operating system'] = 'Sistema operacional';
 $lang['Options'] = 'Opções';
-$lang['Other private categories'] = 'Outras categorias privadas';
+$lang['Other private albums'] = 'Outras categorias privadas';
 $lang['Page banner'] = 'Banner da página (imagem que fica no cabeçalho)';
 $lang['Parent album'] = 'Categoria pai';
 $lang['Path'] = 'Caminho (path)';
 $lang['Permalink'] = 'Permalink (endereço permanente)';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'Permalink %s já está sendo usado pela categoria %s. Apague do histórico do permalink primeiro';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'Permalink %s já está sendo usado pela categoria %s. Apague do histórico do permalink primeiro';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'O permalink deve ser composto de a-z, A-Z, 0-9, "-", "_" ou "/". Não deve ser numérico ou começar com número seguido de "-"';
-$lang['Permalink %s is already used by category %s'] = 'Permalink %s já está sendo usado pela categoria %s';
+$lang['Permalink %s is already used by album %s'] = 'Permalink %s já está sendo usado pela categoria %s';
 $lang['Permalink history'] = 'Histórico permalink';
 $lang['Permalinks'] = 'Permalinks';
 $lang['Permission denied'] = 'Permissão negada';
@@ -151,7 +150,7 @@ $lang['Rating'] = 'Avaliação';
 $lang['Reject All'] = 'Rejeitar tudo';
 $lang['Reject'] = 'Rejeitar';
 $lang['Representant'] = 'Representante';
-$lang['Representation of categories'] = 'Representante das categorias';
+$lang['Representation of albums'] = 'Representante das categorias';
 $lang['Representative'] = 'Representativo';
 $lang['Represents'] = 'Representa';
 $lang['Save order'] = 'Salvar ordem';
@@ -184,7 +183,7 @@ $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 album in its own sub album'] = 'Você não pode mover uma categoria em sua própria sub categoria.';
+$lang['You cannot move an 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';
@@ -192,18 +191,17 @@ $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['Authorize users to add comments on selected albums'] = 'Autorizar os usuários a adicionar comentários nas categorias selecionadas';
 $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';
 $lang['Find a new representant by random'] = 'Encontrar um novo representante aleatoriamente';
 $lang['Public / Private'] = 'Público / Privado';
-$lang['Manage authorizations for selected categories'] = 'Gerenciar as autorizações para categorias selecionadas';
-$lang['Select uploadable categories'] = 'Selecionar categorias uploadable';
+$lang['Manage authorizations for selected albums'] = 'Gerenciar as autorizações para categorias selecionadas';
+$lang['Select uploadable albums'] = 'Selecionar categorias uploadable';
 $lang['Virtual album added'] = 'Categoria virtual adicionada';
 $lang['Virtual album deleted'] = 'Categoria virtual apagada';
-$lang['Category'] = 'Categoria';
 $lang['Access type'] = 'Tipo de acesso';
 $lang['Comments'] = 'Comentários';
 $lang['Information data registered in database'] = 'Dado de informação registrado na base de dados';
@@ -357,10 +355,10 @@ $lang['synchronize metadata'] = 'sincronizar metadado';
 $lang['target'] = 'meta';
 $lang['Thumbnail'] = 'Miniatura';
 $lang['title'] = 'título';
-$lang['Categories management'] = 'Gerenciamento de categorias';
+$lang['Album list management'] = 'Gerenciamento de categorias';
 $lang['Piwigo configuration'] = 'Configuração Piwigo';
 $lang['Piwigo administration'] = 'Administração Piwigo';
-$lang['Edit a category'] = 'Editar uma categoria';
+$lang['Edit album'] = 'Editar uma categoria';
 $lang['Group management'] = 'Gerenciamento de grupo';
 $lang['User list'] = 'Lista de usuário';
 $lang['Modify informations about a picture'] = 'Modificar informações sobre uma imagem';
@@ -391,9 +389,9 @@ $lang['unset'] = 'sem valor (não ajustado)';
 $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';
+$lang['reduce to single existing albums'] = 'reduzir as categorias existentes em apenas uma';
 $lang['Choose an option'] = 'Escolher uma opção';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = 'exibir o máximo de informações (categorias e itens adicionados, categorias e itens apagados)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = 'exibir o máximo de informações (categorias e itens adicionados, categorias e itens apagados)';
 $lang['Piwigo version differs on the remote site'] = 'Versão Piwigo version difere do site remoto';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'A versão de create_listing_file.php no site remoto e do Piwigo devem ser a mesma';
 $lang['listing.xml file was not found'] = 'o arquivo listing.xml não foi encontrado';
@@ -405,12 +403,12 @@ $lang['File/directory read error'] = 'Erro de leitura em arquivo/diretório';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'O arquivo ou diretório não pode ser acessado (ou ele não existe ou o acesso está negado)';
 $lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'um tipo de arquivo imagético requer uma miniatura (thumbnail). A miniatura deve estar presente no sub-diretório "thumbnail" do diretório da categoria. O nome de arquivo da miniatura deve começar com o prefixo pré-configurado para a miniatura e a extensão deve estar entre a seguinte lista :';
 $lang['missing thumbnail'] = 'está faltando thumbnail (miniatura)';
-$lang['categories deleted in the database'] = 'categorias apagadas da base de dados';
+$lang['albums deleted in the database'] = 'categorias apagadas da base de dados';
 $lang['elements deleted in the database'] = 'itens apagados da base de dados';
 $lang['images candidates for metadata synchronization'] = 'imagens candidatas para a sincronização com o metadado';
 $lang['elements informations synchronized with files metadata'] = 'as informações dos itens foram sincronizados com o metadado dos arquivos';
 $lang['errors during synchronization'] = 'erros durante a sincronização';
-$lang['categories added in the database'] = 'categorias adicionadas à base de dados';
+$lang['albums added in the database'] = 'categorias adicionadas à base de dados';
 $lang['elements added in the database'] = 'itens adicionados à base de dados';
 $lang['elements updated in the database'] = 'itens atualizados à base de dados';
 $lang['Search for new images in the directories'] = 'Pesquisar novas imagens nos diretórios';
@@ -442,7 +440,7 @@ $lang['Toggle \'default group\' property'] = 'Ligar/Desligar \'gruppo padrão\'
 $lang['Advanced features'] = 'Características principais';
 $lang['Not linked elements'] = 'Itens não vinculados (Not linked)';
 $lang['Specials'] = 'Ferramentas';
-$lang['Files with same name in more than one physical category'] = 'Arquivos com o mesmo nome em mais de uma categoria física';
+$lang['Files with same name in more than one physical album'] = 'Arquivos com o mesmo nome em mais de uma categoria física';
 $lang['Overall'] = 'Completo(amente)';
 $lang['Year'] = 'Ano';
 $lang['Month'] = 'Mês';
@@ -590,7 +588,7 @@ $lang['Templates configuration has been recorded.'] = 'A configuração dos mode
 $lang['All optimizations have been successfully completed.'] = 'Todas as otimizações foram finalizadas com sucesso.';
 $lang['Optimizations have been completed with some errors.'] = 'As otimizações foram finalizadas com alguns erros.';
 $lang['Modify information'] = 'Modificar informação';
-$lang['edit category informations'] = 'editar informações da categoria';
+$lang['edit album'] = 'editar informações da categoria';
 $lang['nothing'] = 'nada';
 $lang['overrides existing values with empty ones'] = 'sobrepor os valores existentes com valores vazios';
 $lang['manage image ranks'] = 'gerenciar posições (image ranks)';
diff --git a/language/pt_BR/common.lang.php b/language/pt_BR/common.lang.php
index b5b30aafc..0b2da01ae 100644
--- a/language/pt_BR/common.lang.php
+++ b/language/pt_BR/common.lang.php
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Ao menos um dos critéri
 $lang['At least one tag must match'] = 'Ao menos uma das tags deve corresponder';
 $lang['Author'] = 'Autor';
 $lang['Average rate'] = 'Nota média';
-$lang['Categories'] = 'Categorias';
-$lang['Category'] = 'Categoria';
+$lang['Albums'] = 'Categorias';
+$lang['Album'] = 'Categoria';
 $lang['Close this window'] = 'Fechar esta janela';
 $lang['Complete RSS feed (images, comments)'] = 'RSS completo';
 $lang['Confirm Password'] = 'Confirmar senha';
diff --git a/language/pt_PT/admin.lang.php b/language/pt_PT/admin.lang.php
index 47897e202..9998c34b2 100644
--- a/language/pt_PT/admin.lang.php
+++ b/language/pt_PT/admin.lang.php
@@ -59,11 +59,10 @@ $lang['Add'] = 'Adicionar';
 $lang['Allow user registration'] = 'Permitir o registro de usuário';
 $lang['Apply to sub-albums'] = 'Aplicar às subcategorias';
 $lang['Associated'] = 'Associados(as)';
-$lang['Association to categories'] = 'Associação as categorias';
 $lang['Batch management'] = 'Gerenciamento de arquivos em lote';
 $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['Albums 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['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.';
@@ -123,17 +122,17 @@ $lang['New tag'] = 'Tag nova';
 $lang['Number of comments per page'] = 'Número de comentários por página';
 $lang['Number of rates'] = 'Número de votos';
 $lang['Number of thumbnails to create'] = 'Número de miniaturas (thumbnails) para ser criadas';
-$lang['Only private categories are listed'] = 'Apenas as categorias privadas estão listadas';
+$lang['Only private albums are listed'] = 'Apenas as categorias privadas estão listadas';
 $lang['Operating system'] = 'Sistema operacional';
 $lang['Options'] = 'Opções';
-$lang['Other private categories'] = 'Outras categorias privadas';
+$lang['Other private albums'] = 'Outras categorias privadas';
 $lang['Page banner'] = 'Banner da página (imagem que fica no cabeçalho)';
 $lang['Parent album'] = 'Categoria pai';
 $lang['Path'] = 'Caminho (path)';
 $lang['Permalink'] = 'Permalink (endereço permanente)';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'Permalink %s já está a ser usado pela categoria %s. Apague do histórico do permalink primeiro';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'Permalink %s já está a ser usado pela categoria %s. Apague do histórico do permalink primeiro';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'O permalink deve ser composto de a-z, A-Z, 0-9, "-", "_" ou "/". Não deve ser numérico ou começar com número seguido de "-"';
-$lang['Permalink %s is already used by category %s'] = 'Permalink %s já está sendo usado pela categoria %s';
+$lang['Permalink %s is already used by album %s'] = 'Permalink %s já está sendo usado pela categoria %s';
 $lang['Permalink history'] = 'Histórico permalink';
 $lang['Permalinks'] = 'Permalinks';
 $lang['Permission denied'] = 'Permissão negada';
@@ -151,7 +150,7 @@ $lang['Rating'] = 'Avaliação';
 $lang['Reject All'] = 'Rejeitar tudo';
 $lang['Reject'] = 'Rejeitar';
 $lang['Representant'] = 'Representante';
-$lang['Representation of categories'] = 'Representante das categorias';
+$lang['Representation of albums'] = 'Representante das categorias';
 $lang['Representative'] = 'Representativo';
 $lang['Represents'] = 'Representa';
 $lang['Save order'] = 'Salvar ordem';
@@ -184,7 +183,7 @@ $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 album in its own sub album'] = 'Você não pode mover uma categoria em sua própria sub categoria.';
+$lang['You cannot move an 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';
@@ -192,18 +191,17 @@ $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['Authorize users to add comments on selected albums'] = 'Autorizar os usuários a adicionar comentários nas categorias selecionadas';
 $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';
 $lang['Find a new representant by random'] = 'Encontrar um novo representante aleatoriamente';
 $lang['Public / Private'] = 'Público / Privado';
-$lang['Manage authorizations for selected categories'] = 'Gerenciar as autorizações para categorias selecionadas';
-$lang['Select uploadable categories'] = 'Selecionar categorias uploadable';
+$lang['Manage authorizations for selected albums'] = 'Gerenciar as autorizações para categorias selecionadas';
+$lang['Select uploadable albums'] = 'Selecionar categorias uploadable';
 $lang['Virtual album added'] = 'Categoria virtual adicionada';
 $lang['Virtual album deleted'] = 'Categoria virtual apagada';
-$lang['Category'] = 'Categoria';
 $lang['Access type'] = 'Tipo de acesso';
 $lang['Comments'] = 'Comentários';
 $lang['Information data registered in database'] = 'Dado de informação registrado na base de dados';
@@ -357,10 +355,10 @@ $lang['synchronize metadata'] = 'sincronizar metadado';
 $lang['target'] = 'meta';
 $lang['Thumbnail'] = 'Miniatura';
 $lang['title'] = 'título';
-$lang['Categories management'] = 'Gerenciamento de categorias';
+$lang['Album list management'] = 'Gerenciamento de categorias';
 $lang['Piwigo configuration'] = 'Configuração Piwigo';
 $lang['Piwigo administration'] = 'Administração Piwigo';
-$lang['Edit a category'] = 'Editar uma categoria';
+$lang['Edit album'] = 'Editar uma categoria';
 $lang['Group management'] = 'Gerenciamento de grupo';
 $lang['User list'] = 'Lista de usuários';
 $lang['Modify informations about a picture'] = 'Modificar informações sobre uma imagem';
@@ -391,9 +389,9 @@ $lang['unset'] = 'sem valor (não ajustado)';
 $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';
+$lang['reduce to single existing albums'] = 'reduzir as categorias existentes em apenas uma';
 $lang['Choose an option'] = 'Escolher uma opção';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = 'exibir o máximo de informações (categorias e elementos adicionados, categorias e elementos apagados)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = 'exibir o máximo de informações (categorias e elementos adicionados, categorias e elementos apagados)';
 $lang['Piwigo version differs on the remote site'] = 'Versão Piwigo difere do site remoto';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'A versão de create_listing_file.php no site remoto e do Piwigo devem ser a mesma';
 $lang['listing.xml file was not found'] = 'o arquivo listing.xml não foi encontrado';
@@ -405,12 +403,12 @@ $lang['File/directory read error'] = 'Erro de leitura em arquivo/diretório';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'O arquivo ou diretório não pode ser acessado (ou ele não existe ou o acesso está negado)';
 $lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'um tipo de arquivo imagético requer uma miniatura (thumbnail). A miniatura deve estar presente no sub-diretório "thumbnail" do diretório da categoria. O nome de arquivo da miniatura deve começar com o prefixo pré-configurado para a miniatura e a extensão deve estar entre a seguinte lista :';
 $lang['missing thumbnail'] = 'falta thumbnail (miniatura)';
-$lang['categories deleted in the database'] = 'categorias apagadas da base de dados';
+$lang['albums deleted in the database'] = 'categorias apagadas da base de dados';
 $lang['elements deleted in the database'] = 'elementos apagados da base de dados';
 $lang['images candidates for metadata synchronization'] = 'imagens candidatas para a sincronização com o metadado';
 $lang['elements informations synchronized with files metadata'] = 'as informações dos elementos foram sincronizados com o metadado dos arquivos';
 $lang['errors during synchronization'] = 'erros durante a sincronização';
-$lang['categories added in the database'] = 'categorias adicionadas à base de dados';
+$lang['albums added in the database'] = 'categorias adicionadas à base de dados';
 $lang['elements added in the database'] = 'elementos adicionados à base de dados';
 $lang['elements updated in the database'] = 'elementos atualizados à base de dados';
 $lang['Search for new images in the directories'] = 'Pesquisar novas imagens nos diretórios';
@@ -442,7 +440,7 @@ $lang['Toggle \'default group\' property'] = 'Ligar/Desligar \'gruppo padrão\'
 $lang['Advanced features'] = 'Características principais';
 $lang['Not linked elements'] = 'Elementos não vinculados (Not linked)';
 $lang['Specials'] = 'Ferramentas';
-$lang['Files with same name in more than one physical category'] = 'Arquivos com o mesmo nome em mais de uma categoria física';
+$lang['Files with same name in more than one physical album'] = 'Arquivos com o mesmo nome em mais de uma categoria física';
 $lang['Overall'] = 'Completo(amente)';
 $lang['Year'] = 'Ano';
 $lang['Month'] = 'Mês';
@@ -589,7 +587,7 @@ $lang['Templates configuration has been recorded.'] = 'A configuração dos mode
 $lang['All optimizations have been successfully completed.'] = 'Todas as otimizações foram finalizadas com sucesso.';
 $lang['Optimizations have been completed with some errors.'] = 'As otimizações foram finalizadas com alguns erros.';
 $lang['Modify information'] = 'Modificar informação';
-$lang['edit category informations'] = 'editar informações da categoria';
+$lang['edit album'] = 'editar informações da categoria';
 $lang['nothing'] = 'nada';
 $lang['overrides existing values with empty ones'] = 'sobrepor os valores existentes com valores vazios';
 $lang['manage image ranks'] = 'gerenciar posições (image ranks)';
diff --git a/language/pt_PT/common.lang.php b/language/pt_PT/common.lang.php
index dfae57a41..78d596b27 100644
--- a/language/pt_PT/common.lang.php
+++ b/language/pt_PT/common.lang.php
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Ao menos um dos critéri
 $lang['At least one tag must match'] = 'Ao menos uma das tags deve corresponder';
 $lang['Author'] = 'Autor';
 $lang['Average rate'] = 'Nota média';
-$lang['Categories'] = 'Categorias';
-$lang['Category'] = 'Categoria';
+$lang['Albums'] = 'Categorias';
+$lang['Album'] = 'Categoria';
 $lang['Close this window'] = 'Fechar esta janela';
 $lang['Complete RSS feed (images, comments)'] = 'RSS completo';
 $lang['Confirm Password'] = 'Confirmar palavra-passe';
diff --git a/language/ro_RO/common.lang.php b/language/ro_RO/common.lang.php
index d6a45edca..3964beef2 100644
--- a/language/ro_RO/common.lang.php
+++ b/language/ro_RO/common.lang.php
@@ -56,8 +56,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Cel puţin o singură re
 $lang['At least one tag must match'] = 'Cel puţin o etichetă trebuie să se potriveasca';
 $lang['Author'] = 'Autor';
 $lang['Average rate'] = 'Notă medie';
-$lang['Categories'] = 'Categorii';
-$lang['Category'] = 'Categorie';
+$lang['Albums'] = 'Categorii';
+$lang['Album'] = 'Categorie';
 $lang['Close this window'] = 'Inchide această fereastră';
 $lang['Complete RSS feed (images, comments)'] = 'Flux RSS complet (imagini, comentarii)';
 $lang['Confirm Password'] = 'Confirmare parolă';
diff --git a/language/ru_RU/admin.lang.php b/language/ru_RU/admin.lang.php
index 6047747d6..59064632a 100644
--- a/language/ru_RU/admin.lang.php
+++ b/language/ru_RU/admin.lang.php
@@ -59,11 +59,10 @@ $lang['Add'] = 'Добавить';
 $lang['Allow user registration'] = 'Разрешить регистрацию пользователей';
 $lang['Apply to sub-albums'] = 'Применить к подкатегориям';
 $lang['Associated'] = 'Связаны';
-$lang['Association to categories'] = 'Связь с категориями';
 $lang['Batch management'] = 'Пакетная обработка';
 $lang['Caddie management'] = 'Управление корзиной';
 $lang['Caddie'] = 'Корзина';
-$lang['Categories authorized thanks to group associations'] = 'Категории, разрешенные благодаря связи с группой';
+$lang['Albums authorized thanks to group associations'] = 'Категории, разрешенные благодаря связи с группой';
 $lang['Album manual order was saved'] = 'Особый порядок категорий сохранен';
 $lang['Album elements associated to the following albums: %s'] = 'Фотографии категории, связаны со следующими категориями: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'Проверка обновлений не удалась по неизвестным причинам.';
@@ -123,17 +122,17 @@ $lang['New tag'] = 'Новое слово';
 $lang['Number of comments per page'] = 'Количество комментариев на странице';
 $lang['Number of rates'] = 'Количество оценок';
 $lang['Number of thumbnails to create'] = 'Количество создаваемых миниатюр';
-$lang['Only private categories are listed'] = 'Показ только скрытых категорий';
+$lang['Only private albums are listed'] = 'Показ только скрытых категорий';
 $lang['Operating system'] = 'Операционная система';
 $lang['Options'] = 'Опции';
-$lang['Other private categories'] = 'Доступ к приватным категориям';
+$lang['Other private albums'] = 'Доступ к приватным категориям';
 $lang['Page banner'] = 'Надпись на баннере';
 $lang['Parent album'] = 'Родительская категория';
 $lang['Path'] = 'Путь';
 $lang['Permalink'] = 'Постоянная ссылка';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'Постоянная ссылка %s была ранее использована для категории %s. Удалите ее сначала из истории постоянных ссылок';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'Постоянная ссылка %s была ранее использована для категории %s. Удалите ее сначала из истории постоянных ссылок';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'Имя постоянной ссылки должно состоять из a-z, A-Z, 0-9, "-" или "_". Оно не должно быть числовым или начинаться с числа с "-"';
-$lang['Permalink %s is already used by category %s'] = 'Постоянная ссылка %s уже используется для категории %s';
+$lang['Permalink %s is already used by album %s'] = 'Постоянная ссылка %s уже используется для категории %s';
 $lang['Permalink history'] = 'История постоянных ссылок';
 $lang['Permalinks'] = 'Постоянные ссылки';
 $lang['Permission denied'] = 'Доступ запрещен';
@@ -151,7 +150,7 @@ $lang['Rating'] = 'Оценки';
 $lang['Reject All'] = 'Отклонить все';
 $lang['Reject'] = 'Отклонить';
 $lang['Representant'] = 'Представитель';
-$lang['Representation of categories'] = 'Представление категорий';
+$lang['Representation of albums'] = 'Представление категорий';
 $lang['Representative'] = 'Представитель';
 $lang['Represents'] = 'Представляет';
 $lang['Save order'] = 'Сохранить порядок';
@@ -183,7 +182,7 @@ $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 album in its own sub album'] = 'Вы не можете переместить категорию в ее собственную подкатегорию';
+$lang['You cannot move an album in its own sub album'] = 'Вы не можете переместить категорию в ее собственную подкатегорию';
 $lang['You need to confirm deletion'] = 'Вам нужно подтвердить удаление';
 $lang['add tags'] = 'добавить слова';
 $lang['Adviser'] = 'Помощник';
@@ -191,18 +190,17 @@ $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['Authorize users to add comments on selected albums'] = 'Позволить пользователям добавлять комментарии к выбранным категориям';
 $lang['The name of an album must not be empty'] = 'Название категории не должно быть пустым';
 $lang['Lock albums'] = 'Заблокировать категории';
 $lang['Private'] = 'Приватная категория';
 $lang['Public'] = 'Общедоступная категория';
 $lang['Find a new representant by random'] = 'Найти нового представителя случайным образом';
 $lang['Public / Private'] = 'Общедоступные / Приватные';
-$lang['Manage authorizations for selected categories'] = 'Управление авторизацией для выбранных категорий';
-$lang['Select uploadable categories'] = 'Выбор категорий в которые возможна загрузка';
+$lang['Manage authorizations for selected albums'] = 'Управление авторизацией для выбранных категорий';
+$lang['Select uploadable albums'] = 'Выбор категорий в которые возможна загрузка';
 $lang['Virtual album added'] = 'Виртуальная категория добавлена';
 $lang['Virtual album deleted'] = 'Виртуальная категория удалена';
-$lang['Category'] = 'категория';
 $lang['Access type'] = 'Тип доступа';
 $lang['Comments'] = 'Комментарии';
 $lang['Information data registered in database'] = 'Информация зарегистрирована в базе данных';
@@ -354,10 +352,10 @@ $lang['synchronize metadata'] = 'синхронизировать метадан
 $lang['target'] = 'изменить';
 $lang['Thumbnail'] = 'миниатюра';
 $lang['title'] = 'Название';
-$lang['Categories management'] = 'Управление категориями';
+$lang['Album list management'] = 'Управление категориями';
 $lang['Piwigo configuration'] = 'Настройка PhpWebGallery';
 $lang['Piwigo administration'] = 'Администрирование PhpWebGallery';
-$lang['Edit a category'] = 'Редактирование категории';
+$lang['Edit album'] = 'Редактирование категории';
 $lang['Group management'] = 'Управление группами';
 $lang['User list'] = 'Список пользователей';
 $lang['Modify informations about a picture'] = 'Изменить информацию об изображении';
@@ -388,9 +386,9 @@ $lang['unset'] = 'очистить';
 $lang['Update albums informations'] = 'обновить информацию о категориях';
 $lang['Update images informations'] = 'обновить информацию о фотографиях';
 $lang['Synchronize'] = 'Синхронизация';
-$lang['reduce to single existing categories'] = 'проверить только категорию';
+$lang['reduce to single existing albums'] = 'проверить только категорию';
 $lang['Choose an option'] = 'Выберите параметры';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = 'показать максимум информации (добавленные категории и фотографии, удаленные категории и элементы)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = 'показать максимум информации (добавленные категории и фотографии, удаленные категории и элементы)';
 $lang['Piwigo version differs on the remote site'] = 'версия PhpWebGallery отличается на удаленном сайте';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'Версии create_listing_file.php на удаленном сайте и PhpWebGallery должны быть одинаковыми';
 $lang['listing.xml file was not found'] = 'файл listing.xml не найден';
@@ -402,12 +400,12 @@ $lang['File/directory read error'] = 'Ошибка чтения файла/па�
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'Нет доступа к файлу или папке (возможно они отсутствуют или доступ к ним запрещен)';
 $lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'для этого типа файлов нужна миниатюра. Миниатюры должны находиться в подпапке "thumbnail" папки категории. Имя файла миниатюры должно начинаться с указанного в конфигурации префикса, расширение должно быть одним из нижеперечисленных:';
 $lang['missing thumbnail'] = 'отсутствуют миниатюры';
-$lang['categories deleted in the database'] = 'категорий удалено из базы данных';
+$lang['albums deleted in the database'] = 'категорий удалено из базы данных';
 $lang['elements deleted in the database'] = 'элементов удалено из базы данных';
 $lang['images candidates for metadata synchronization'] = 'изображений для синхронизации метаданных';
 $lang['elements informations synchronized with files metadata'] = 'информация об элементах синхронизирована с метаданными файлов';
 $lang['errors during synchronization'] = 'ошибок синхронизации';
-$lang['categories added in the database'] = 'категорий добавлено в базу данных';
+$lang['albums added in the database'] = 'категорий добавлено в базу данных';
 $lang['elements added in the database'] = 'элементов добавлено в базу данных';
 $lang['elements updated in the database'] = 'элементов обновлено в базе данных';
 $lang['Search for new images in the directories'] = 'Поиск новых изображений в папках';
@@ -439,7 +437,7 @@ $lang['Toggle \'default group\' property'] = 'Сделать/убрать \'по
 $lang['Advanced features'] = 'Расширенные функции';
 $lang['Not linked elements'] = 'Не привязанные элементы';
 $lang['Specials'] = 'Спец функции';
-$lang['Files with same name in more than one physical category'] = 'Файлы с одинаковыми именами в разных папках';
+$lang['Files with same name in more than one physical album'] = 'Файлы с одинаковыми именами в разных папках';
 
 $lang['Overall'] = 'Вся';
 $lang['Year'] = 'Год';
@@ -588,7 +586,7 @@ $lang['Templates configuration has been recorded.'] = 'Templates configuration h
 $lang['All optimizations have been successfully completed.'] = 'Все оптимизации успешно завершены.';
 $lang['Optimizations have been completed with some errors.'] = 'Оптимизации завершены с ошибками.';
 $lang['Modify information'] = 'Modify information';
-$lang['edit category informations'] = 'редактировать категорию';
+$lang['edit album'] = 'редактировать категорию';
 $lang['nothing'] = 'ничего';
 $lang['overrides existing values with empty ones'] = 'замена существующих значений пустыми';
 $lang['manage image ranks'] = 'управление порядком изображений';
@@ -637,18 +635,18 @@ $lang['Forbid this theme to users'] = 'Запретить использован
 $lang['Set as default theme for unregistered and new users'] = 'Установить тему по умолчанию для новых и незарегистрированных пользователей';
 $lang['unknown'] = 'неизвестен';
 $lang['Upload Photos'] = 'Загрзить фотографии';
-$lang['Drop into category'] = 'Перенести в категорию';
+$lang['Drop into album'] = 'Перенести в категорию';
 $lang['+ Add an upload box'] = '+ Добавить поле для загрузки';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Создайте "%s" каталог в корне установленной Вами Piwigo';
 $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['existing album'] = 'существующая категория';
+$lang['create a new album'] = 'создать новую категория';
 $lang['Album name'] = 'Имя категории';
-$lang['Category "%s" has been added'] = 'Категория "%s" добавлена';
+$lang['Album "%s" has been added'] = 'Категория "%s" добавлена';
 $lang['Uploaded Photos'] = 'Загруженные фотографии';
 $lang['%d photos uploaded'] = '%d фотографий загружено';
 $lang['Privacy level set to "%s"'] = 'Установить уровень доступа "%s"';
-$lang['Category "%s" now contains %d photos'] = 'Категория "%s" содержит сейчас %d фотографий';
+$lang['Album "%s" now contains %d photos'] = 'Категория "%s" содержит сейчас %d фотографий';
 $lang['Manage this set of %d photos'] = 'Редактировать этот набор из %d фотографий';
 $lang['Select files'] = 'Выбрать файлы';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG файлы или ZIP архивы с JPEG файлами внутри, пожалуйста.';
diff --git a/language/ru_RU/common.lang.php b/language/ru_RU/common.lang.php
index 10018ca24..d36777d98 100644
--- a/language/ru_RU/common.lang.php
+++ b/language/ru_RU/common.lang.php
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Хотя бы одно �
 $lang['At least one tag must match'] = 'Хотя бы одно слово должно присутствовать';
 $lang['Author'] = 'Автор';
 $lang['Average rate'] = 'Средний балл';
-$lang['Categories'] = 'Галереи';
-$lang['Category'] = 'Галерея';
+$lang['Albums'] = 'Галереи';
+$lang['Album'] = 'Галерея';
 $lang['Close this window'] = 'Закрыть это окно';
 $lang['Complete RSS feed (images, comments)'] = 'Полная RSS лента (фотографии, комментарии)';
 $lang['Confirm Password'] = 'Повторите пароль';
diff --git a/language/sr_RS/admin.lang.php b/language/sr_RS/admin.lang.php
index 39815a030..56da00141 100644
--- a/language/sr_RS/admin.lang.php
+++ b/language/sr_RS/admin.lang.php
@@ -59,11 +59,10 @@ $lang['Add'] = 'Dodaj';
 $lang['Allow user registration'] = 'Odobri upis korisnika';
 $lang['Apply to sub-albums'] = 'Primeni na podkategorije';
 $lang['Associated'] = 'Povezanost';
-$lang['Association to categories'] = 'Povezanost sa kategorijama';
 $lang['Batch management'] = 'Uređenje';
 $lang['Caddie management'] = 'Kontrola fioke';
 $lang['Caddie'] = 'Fioka';
-$lang['Categories authorized thanks to group associations'] = 'Kategorije overene zahvaljujući grupnoj vezi';
+$lang['Albums authorized thanks to group associations'] = 'Kategorije overene zahvaljujući grupnoj vezi';
 $lang['Album manual order was saved'] = 'Redosled kategorija je sačuvan';
 $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.';
@@ -123,17 +122,17 @@ $lang['New tag'] = 'Nova oznaka';
 $lang['Number of comments per page'] = 'Broj komentara po stranici';
 $lang['Number of rates'] = 'Broj ocena';
 $lang['Number of thumbnails to create'] = 'broj poveznih sličica za izradu';
-$lang['Only private categories are listed'] = 'Samo lične kategorije su ispisane';
+$lang['Only private albums are listed'] = 'Samo lične kategorije su ispisane';
 $lang['Operating system'] = 'Operativni sistem';
 $lang['Options'] = 'Mogućnosti';
-$lang['Other private categories'] = 'Ostale lične kategorije';
+$lang['Other private albums'] = 'Ostale lične kategorije';
 $lang['Page banner'] = 'Baner stranice';
 $lang['Parent album'] = 'Nadređena kategorija';
 $lang['Path'] = 'Putanja';
 $lang['Permalink'] = 'Stalna veza';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'Stalna veza %s je prethodno korišćtena od kategorije %s. Prvo je izbrišite iz starih zapisa';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'Stalna veza %s je prethodno korišćtena od kategorije %s. Prvo je izbrišite iz starih zapisa';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'Stalna veza mora biti sastavljena od znakova a-z, A-Z, 0-9, "-", "_" ili "/". Ne sme biti brojčana vrijednost ili počinjati brojem pa znakom "-"';
-$lang['Permalink %s is already used by category %s'] = 'Stalnu vezu %s već koristi kategorija %s';
+$lang['Permalink %s is already used by album %s'] = 'Stalnu vezu %s već koristi kategorija %s';
 $lang['Permalink history'] = 'Istorija stalnih veza';
 $lang['Permalinks'] = 'Stalne veze';
 $lang['Permission denied'] = 'Dozvola uskraćena';
@@ -151,7 +150,7 @@ $lang['Rating'] = 'Ocenjivanje';
 $lang['Reject All'] = 'Odbaci Sve';
 $lang['Reject'] = 'Odbaci';
 $lang['Representant'] = 'Predstavnik';
-$lang['Representation of categories'] = 'Predstavljanje kategorija';
+$lang['Representation of albums'] = 'Predstavljanje kategorija';
 $lang['Representative'] = 'Predstavljeno';
 $lang['Represents'] = 'Predstavlja';
 $lang['Save order'] = 'Snimi raspored';
@@ -184,7 +183,7 @@ $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 album in its own sub album'] = 'Ne možete premestiti kategoriju u njenu podkategoriju';
+$lang['You cannot move an 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';
@@ -192,18 +191,17 @@ $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['Authorize users to add comments on selected albums'] = 'Ovlastite korisnike za davanje komentara u odabranim kategorijama';
 $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';
 $lang['Find a new representant by random'] = 'Izbor novog predstavnika slučajnim izborom';
 $lang['Public / Private'] = 'Javno / Lično';
-$lang['Manage authorizations for selected categories'] = 'Upravljanje ovlašćenjima za odabrane kategorije';
-$lang['Select uploadable categories'] = 'Odaberite kategorije u kojima je moguće slanje';
+$lang['Manage authorizations for selected albums'] = 'Upravljanje ovlašćenjima za odabrane kategorije';
+$lang['Select uploadable albums'] = 'Odaberite kategorije u kojima je moguće slanje';
 $lang['Virtual album added'] = 'Virtuelna kategorija dodata';
 $lang['Virtual album deleted'] = 'Virtuelna kategorija izbrisana';
-$lang['Category'] = 'Kategorija';
 $lang['Access type'] = 'Vrsta pristupa';
 $lang['Comments'] = 'Komentari';
 $lang['Information data registered in database'] = 'Podaci upisani u bazu podataka';
@@ -357,10 +355,10 @@ $lang['synchronize metadata'] = 'sinhronizuj meta podatke';
 $lang['target'] = 'odredište';
 $lang['Thumbnail'] = 'Povezne sličice';
 $lang['title'] = 'naslov';
-$lang['Categories management'] = 'Upravljanje kategorijama';
+$lang['Album list management'] = 'Upravljanje kategorijama';
 $lang['Piwigo configuration'] = 'Piwigo podešavanja';
 $lang['Piwigo administration'] = 'Piwigo administracija';
-$lang['Edit a category'] = 'Uredi kategoriju';
+$lang['Edit album'] = 'Uredi kategoriju';
 $lang['Group management'] = 'Upravljanje grupama';
 $lang['User list'] = 'Lista korisnika';
 $lang['Modify informations about a picture'] = 'Promena podataka o slici';
@@ -391,9 +389,9 @@ $lang['unset'] = 'razdešeno';
 $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';
+$lang['reduce to single existing albums'] = 'umanji na jednu postojeću kategoriju-e';
 $lang['Choose an option'] = 'Izaberite mogućnost';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = 'najopširniji mogući prikaz podataka (dodate kategorije i elementi, izbrisane  kategorije i elementi)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = 'najopširniji mogući prikaz podataka (dodate kategorije i elementi, izbrisane  kategorije i elementi)';
 $lang['Piwigo version differs on the remote site'] = 'Piwigo inačica na udaljenom mjestu se razlikuje';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'Verzija create_listing_file.php na udaljenoj stranici i Piwigo-u mora biti jednaka';
 $lang['listing.xml file was not found'] = 'listing.xml datoteka nije pronađena';
@@ -405,12 +403,12 @@ $lang['File/directory read error'] = 'Greška čitanja datoteke/direktorijuma';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'Datoteci ili direktorijumu se ne može pristupiti (ne postoji ili je pristup zabranjen)';
 $lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'Ova datoteka zahtjeva poveznu sličicu. Povezna sličica mora biti prisutna u poddirektorijumu "thumbnail" direktorijuma kategorije. Naziv povezne sličice mora počinjati sa podrazumevanim predznakom i nastavak mora biti jedan od popisanih :';
 $lang['missing thumbnail'] = 'nedostajuće povezne sličice';
-$lang['categories deleted in the database'] = 'kategorije izbrisane iz baze podataka';
+$lang['albums deleted in the database'] = 'kategorije izbrisane iz baze podataka';
 $lang['elements deleted in the database'] = 'elementi izbrisani iz baze podataka';
 $lang['images candidates for metadata synchronization'] = 'slika kandidata za sinhronizaciju meta podataka';
 $lang['elements informations synchronized with files metadata'] = 'podataka elemenata sinhronizovano sa meta podacima datoteke';
 $lang['errors during synchronization'] = 'grešaka tokom sinhronizacije';
-$lang['categories added in the database'] = 'kategorija dodato u bazu podataka';
+$lang['albums added in the database'] = 'kategorija dodato u bazu podataka';
 $lang['elements added in the database'] = 'elemenata dodato u bazu podataka';
 $lang['elements updated in the database'] = 'elemenata obnovljeno u bazi podataka';
 $lang['Search for new images in the directories'] = 'Pretraživanje novih slika u direktorijumima';
@@ -442,7 +440,7 @@ $lang['Toggle \'default group\' property'] = 'Promeni \'podrazumevana grupa\' os
 $lang['Advanced features'] = 'Napredne mogućnosti';
 $lang['Not linked elements'] = 'Nema elemenata sa vezom';
 $lang['Specials'] = 'Posebnosti';
-$lang['Files with same name in more than one physical category'] = 'Datoteka istog imena u više od jednoj stvarnoj kategoriji';
+$lang['Files with same name in more than one physical album'] = 'Datoteka istog imena u više od jednoj stvarnoj kategoriji';
 
 $lang['Overall'] = 'Sveukupno';
 $lang['Year'] = 'Godina';
@@ -591,7 +589,7 @@ $lang['Templates configuration has been recorded.'] = 'Podešavnje šablona je s
 $lang['All optimizations have been successfully completed.'] = 'Sva poboljšanja su uspešno dovršena.';
 $lang['Optimizations have been completed with some errors.'] = 'Poboljšanja su izvršena uz neke greške.';
 $lang['Modify information'] = 'Promeni podatak';
-$lang['edit category informations'] = 'uredi podatke o kategoriji';
+$lang['edit album'] = 'uredi podatke o kategoriji';
 $lang['nothing'] = 'ništa';
 $lang['overrides existing values with empty ones'] = 'prekucava postojeće vrednosti praznim poljima';
 $lang['manage image ranks'] = 'upravljanje poretkom slika';
@@ -639,18 +637,18 @@ $lang['Forbid this theme to users'] = 'Zabrani ovu temu korisnicima';
 $lang['Set as default theme for unregistered and new users'] = 'Postavi kao podrazumevanu temu za neregistrovane i nove korisnike';
 $lang['unknown'] = 'nepoznato';
 $lang['Upload Photos'] = 'Pošalji fotografije';
-$lang['Drop into category'] = 'Baci u kategoriju';
+$lang['Drop into album'] = 'Baci u kategoriju';
 $lang['+ Add an upload box'] = '+ Dodaj kutiju za slanje';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Napravi "%s" directorijum u korenu Vaše Piwigo instalacije';
 $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['existing album'] = 'postojeće kategorije';
+$lang['create a new album'] = 'napravi novu kategoriju';
 $lang['Album name'] = 'Naziv kategorije';
-$lang['Category "%s" has been added'] = 'Kategorija "%s" je dodata';
+$lang['Album "%s" has been added'] = 'Kategorija "%s" je dodata';
 $lang['Uploaded Photos'] = 'Pošalji fotografije';
 $lang['%d photos uploaded'] = '%d fotografije poslate';
 $lang['Privacy level set to "%s"'] = 'Nivo privatnosti podešen na "%s"';
-$lang['Category "%s" now contains %d photos'] = 'Kategorija "%s" sada sadrži %d fotografija';
+$lang['Album "%s" now contains %d photos'] = 'Kategorija "%s" sada sadrži %d fotografija';
 $lang['Manage this set of %d photos'] = 'Uredi ovaj set %d fotografija';
 $lang['Select files'] = 'Izaberi datoteke';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG datoteke ili ZIP arhive sa JPEG datotekama u sebi molim.';
diff --git a/language/sr_RS/common.lang.php b/language/sr_RS/common.lang.php
index e5e7de147..edcc336ff 100644
--- a/language/sr_RS/common.lang.php
+++ b/language/sr_RS/common.lang.php
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Najmanje jedno od navede
 $lang['At least one tag must match'] = 'Najmanje jedan tag se mora poklapati';
 $lang['Author'] = 'Autor';
 $lang['Average rate'] = 'Prosečna ocena';
-$lang['Categories'] = 'Kategorije';
-$lang['Category'] = 'Kategorija';
+$lang['Albums'] = 'Kategorije';
+$lang['Album'] = 'Kategorija';
 $lang['Close this window'] = 'Zatvori prozor';
 $lang['Complete RSS feed (images, comments)'] = 'Potpuni RSS izvori (slike, komentari)';
 $lang['Confirm Password'] = 'Potvrdi Lozinku';
diff --git a/language/tr_TR/common.lang.php b/language/tr_TR/common.lang.php
index c1a78a71d..f69b4fc4a 100644
--- a/language/tr_TR/common.lang.php
+++ b/language/tr_TR/common.lang.php
@@ -52,8 +52,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Bir listeleme kriteri se
 $lang['At least one tag must match'] = 'Bir etiket seçilmeli';
 $lang['Author'] = 'Yazar';
 $lang['Average rate'] = 'Ortalama Puan';
-$lang['Categories'] = 'Kategoriler';
-$lang['Category'] = 'Kategori';
+$lang['Albums'] = 'Kategoriler';
+$lang['Album'] = 'Kategori';
 $lang['Close this window'] = 'Pencereyi Kapat';
 $lang['Complete RSS feed (images, comments)'] = ' RSS alanını tamamla  (resimler, yorumlar)';
 $lang['Confirm Password'] = 'Sifreyi Onayla';
diff --git a/language/vi_VN/admin.lang.php b/language/vi_VN/admin.lang.php
index 3e479078f..46fdddd3a 100644
--- a/language/vi_VN/admin.lang.php
+++ b/language/vi_VN/admin.lang.php
@@ -59,11 +59,10 @@ $lang['Add'] = 'Thêm';
 $lang['Allow user registration'] = 'Cho phép đăng ký';

 $lang['Apply to sub-albums'] = 'Áp dụng cho các đề mục nhỏ';

 $lang['Associated'] = 'Được kết hợp';

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

 $lang['Batch management'] = 'Quản lý nhóm';

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

 $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['Albums 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['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';

@@ -124,18 +123,18 @@ $lang['New tag'] = 'Tag mới';
 $lang['Number of comments per page'] = 'Số lời bình trên một trang';

 $lang['Number of rates'] = 'Số lần đánh giá';

 $lang['Number of thumbnails to create'] = 'Số hình thu nhỏ cần tạo ra';

-$lang['Only private categories are listed'] = 'Chỉ những đề mục riêng tư mới được liệt kê';

+$lang['Only private albums are listed'] = 'Chỉ những đề mục riêng tư mới được liệt kê';

 $lang['Operating system'] = 'Hệ điều hành';

 $lang['Options'] = 'Tuỳ chọn';

 $lang['Order alphanumerically'] = 'Sắp xếp theo thứ tự A,B,C...';

-$lang['Other private categories'] = 'Các đề mục riêng tư khác';

+$lang['Other private albums'] = 'Các đề mục riêng tư khác';

 $lang['Page banner'] = 'Banner của trang';

 $lang['Parent album'] = 'Đề mục ngoài';

 $lang['Path'] = 'Đường dẫn';

 $lang['Permalink'] = 'Liên kết cố định';

-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'Có %s liên kết cố định đã được dùng trước đó bởi đề mục %s. Hãy xoá liên kết cố định này từ bảng ghi trước.';

+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'Có %s liên kết cố định đã được dùng trước đó bởi đề mục %s. Hãy xoá liên kết cố định này từ bảng ghi trước.';

 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"';

-$lang['Permalink %s is already used by category %s'] = 'Permalink %s is already used by category %s';

+$lang['Permalink %s is already used by album %s'] = 'Permalink %s is already used by album %s';

 $lang['Permalink history'] = 'Permalink history';

 $lang['Permalinks'] = 'Permalinks';

 $lang['Permission denied'] = 'Permission denied';

@@ -153,7 +152,7 @@ $lang['Rating'] = 'Đánh giá';
 $lang['Reject All'] = 'Từ chối tất cả';

 $lang['Reject'] = 'Từ chối';

 $lang['Representant'] = 'Hình đại diện';

-$lang['Representation of categories'] = 'Hình đại diện cho các đề mục';

+$lang['Representation of albums'] = 'Hình đại diện cho các đề mục';

 $lang['Representative'] = 'Đại diện';

 $lang['Represents'] = 'Hình đại diện';

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

@@ -186,7 +185,7 @@ $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 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 cannot move an 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';

@@ -194,18 +193,17 @@ $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['Authorize users to add comments on selected albums'] = '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 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)';

 $lang['Find a new representant by random'] = 'Tìm ngẫu nhiên hình ảnh đại diện mới';

 $lang['Public / Private'] = 'Chung / Riêng tư';

-$lang['Manage authorizations for selected categories'] = 'Quản lý sự cho phép đối với những đề mục được chọn';

-$lang['Select uploadable categories'] = 'Chọn những đề mục có thể được phép upload hình ảnh';

+$lang['Manage authorizations for selected albums'] = 'Quản lý sự cho phép đối với những đề mục được chọn';

+$lang['Select uploadable albums'] = 'Chọn những đề mục có thể được phép upload hình ảnh';

 $lang['Virtual album added'] = 'Đề mục ảo đã được thêm vào';

 $lang['Virtual album deleted'] = 'Đề mục ảo đã bị xoá';

-$lang['Category'] = 'Đề mục';

 $lang['Access type'] = 'Kiểu truy cập';

 $lang['Comments'] = 'Lời bình';

 $lang['Information data registered in database'] = 'Dữ liệu thông tin đã thêm vào cơ sở dữ liệu';

@@ -358,10 +356,10 @@ $lang['synchronize metadata'] = 'đồng bộ hóa metadata';
 $lang['target'] = 'mục tiêu';

 $lang['Thumbnail'] = 'Hình thu nhỏ';

 $lang['title'] = 'Tiêu đề';

-$lang['Categories management'] = 'Quản lý đề mục';

+$lang['Album list management'] = 'Quản lý đề mục';

 $lang['Piwigo configuration'] = 'Cấu hình Piwigo';

 $lang['Piwigo administration'] = 'Quản trị Piwigo';

-$lang['Edit a category'] = 'Biên tập một đề mục';

+$lang['Edit album'] = 'Biên tập một đề mục';

 $lang['Group management'] = 'Quản lý nhóm';

 $lang['User list'] = 'Danh sách thành viên';

 $lang['Modify informations about a picture'] = 'Chỉnh sửa thông tin của hình ảnh';

@@ -392,9 +390,9 @@ $lang['unset'] = 'không đặt';
 $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';

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

 $lang['Choose an option'] = 'Chọn một tùy chọn';

-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = 'hiển thi thông tin tối đa (thành phần và đề mục được thêm vào hoặc bị xóa đi)';

+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = 'hiển thi thông tin tối đa (thành phần và đề mục được thêm vào hoặc bị xóa đi)';

 $lang['Piwigo version differs on the remote site'] = 'Phiên bản Piwigo không giống với phiên bản trên site truy xuất từ xa';

 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'Phiên bản file create_listing_file.php trên site truy xuất từ xa và phiên bản Piwigo phải như nhau';

 $lang['listing.xml file was not found'] = 'File listing.xml không tìm thấy';

@@ -406,12 +404,12 @@ $lang['File/directory read error'] = 'Lỗi đọc file/thư mục';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'Tệp tin hoặc thư mục không truy xuất được (có thê nó không tồn tại hoặc bị từ chối truy cập)';

 $lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'một loại file hình ảnh yêu cầu một hình thu nhỏ. Hình thu nhỏ phải có trong thư mục con có tên là "thumbnail" của thư mục đề mục. Tên của hình thu nhỏ phải bắt đầu bằng tiền tố hình thu nhỏ đã được thiết lập và phần mở rộng phải nằm trong danh sách định dạng file cho phép ';

 $lang['missing thumbnail'] = 'thiếu hình thu nhỏ';

-$lang['categories deleted in the database'] = 'đã xóa các đề mục trong cơ sở dữ liệu';

+$lang['albums deleted in the database'] = 'đã xóa các đề mục trong cơ sở dữ liệu';

 $lang['elements deleted in the database'] = 'đã xóa các thành phần trong cơ sở dữ liệu';

 $lang['images candidates for metadata synchronization'] = 'hình ảnh được bình chọn cho việc đồng bộ hóa metadata';

 $lang['elements informations synchronized with files metadata'] = 'thông tin những thành phần được đồng bộ hóa với metadata của file';

 $lang['errors during synchronization'] = 'lỗi xuất hiện trong quá trình đồng bộ hóa';

-$lang['categories added in the database'] = 'đề mục được thêm vào cơ sở dữ liệu';

+$lang['albums added in the database'] = 'đề mục được thêm vào cơ sở dữ liệu';

 $lang['elements added in the database'] = 'thành phần được thêm vào cơ sở dữ liệu';

 $lang['elements updated in the database'] = 'thành phần được cập nhật vào cơ sở dữ liệu';

 $lang['Search for new images in the directories'] = 'Tìm kiếm hình mới trong thư mục';

@@ -443,7 +441,7 @@ $lang['Toggle \'default group\' property'] = 'Dịch chuyển \'nhóm mặc đ�
 $lang['Advanced features'] = 'Advanced features';

 $lang['Not linked elements'] = 'Những thành phần không được liên kết';

 $lang['Specials'] = 'Đặc biệt';

-$lang['Files with same name in more than one physical category'] = 'Những tệp tin có cùng tên nằm trong nhiều hơn một đề mục vật lý';

+$lang['Files with same name in more than one physical album'] = 'Những tệp tin có cùng tên nằm trong nhiều hơn một đề mục vật lý';

 $lang['Overall'] = 'Toàn bộ';

 $lang['Year'] = 'Năm';

 $lang['Month'] = 'Tháng';

@@ -590,7 +588,7 @@ $lang['Templates configuration has been recorded.'] = 'Cầu hình tempalte đã
 $lang['All optimizations have been successfully completed.'] = 'Tất cả quá trình tối ưu hóa đã hoàn thành xong.';

 $lang['Optimizations have been completed with some errors.'] = 'Quá trình tối ưu hóa đã hoàn thành với một vài lỗi.';

 $lang['Modify information'] = 'Hiệu chỉnh thông tin';

-$lang['edit category informations'] = 'biên tập thông tin đề mục';

+$lang['edit album'] = 'biên tập thông tin đề mục';

 $lang['nothing'] = 'không có gì';

 $lang['overrides existing values with empty ones'] = 'ghi đè giá trị đang tồn tại bằng giá trị rỗng';

 $lang['manage image ranks'] = 'Quản lý xếp hạng hình ảnh';

diff --git a/language/vi_VN/common.lang.php b/language/vi_VN/common.lang.php
index f7cbc0f7e..8611ad354 100644
--- a/language/vi_VN/common.lang.php
+++ b/language/vi_VN/common.lang.php
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Ít nhất một điều
 $lang['At least one tag must match'] = 'Ít nhất phải có một tag trùng nhau';

 $lang['Author'] = 'Tác giả';

 $lang['Average rate'] = 'Xếp hạng trung bình';

-$lang['Categories'] = 'Đề mục';

-$lang['Category'] = 'Đề mục';

+$lang['Albums'] = 'Đề mục';

+$lang['Album'] = 'Đề mục';

 $lang['Close this window'] = 'Đóng';

 $lang['Complete RSS feed (images, comments)'] = 'Bản RSS feed đầy đủ (gồm hình ảnh và lời bình)';

 $lang['Confirm Password'] = 'Xác nhận lại mật khẩu';

diff --git a/language/zh_CN/admin.lang.php b/language/zh_CN/admin.lang.php
index 21a86fb16..c2a8c1f78 100644
--- a/language/zh_CN/admin.lang.php
+++ b/language/zh_CN/admin.lang.php
@@ -59,11 +59,10 @@ $lang['Add'] = '增加';
 $lang['Allow user registration'] = '允许用户注册';
 $lang['Apply to sub-albums'] = '应用于子类中';
 $lang['Associated'] = '关联于';
-$lang['Association to categories'] = '与类相关联';
 $lang['Batch management'] = '分批管理';
 $lang['Caddie management'] = '购物篮管理';
 $lang['Caddie'] = '购物篮';
-$lang['Categories authorized thanks to group associations'] = '同组成员可以访问授权类';
+$lang['Albums authorized thanks to group associations'] = '同组成员可以访问授权类';
 $lang['Album manual order was saved'] = '类手动排序已保存';
 $lang['Album elements associated to the following albums: %s'] = '本类成员与如下类产生关联: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = '因未知原因导致更新检测失败.';
@@ -123,17 +122,17 @@ $lang['New tag'] = '新标签';
 $lang['Number of comments per page'] = '每页评论数';
 $lang['Number of rates'] = '投票数';
 $lang['Number of thumbnails to create'] = '缩略图数';
-$lang['Only private categories are listed'] = '只列表显示私类';
+$lang['Only private albums are listed'] = '只列表显示私类';
 $lang['Operating system'] = '操作系统';
 $lang['Options'] = '选项';
-$lang['Other private categories'] = '另外私类';
+$lang['Other private albums'] = '另外私类';
 $lang['Page banner'] = '页标语';
 $lang['Parent album'] = '父类';
 $lang['Path'] = '路径';
 $lang['Permalink'] = '固定链接';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = '链接 %s 先前已经被类 %s 使用. 请删除固定链接历史记录';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = '链接 %s 先前已经被类 %s 使用. 请删除固定链接历史记录';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = '固定链接中包含了非法字符（"a-zA-Z0-9", "-", "_" ou "/"）. 禁止使用数字和以"-"开头后面紧跟数字';
-$lang['Permalink %s is already used by category %s'] = '链接 %s 已经被类 %s 使用.';
+$lang['Permalink %s is already used by album %s'] = '链接 %s 已经被类 %s 使用.';
 $lang['Permalink history'] = '固定链接历史记录';
 $lang['Permalinks'] = '固定链接';
 $lang['Permission denied'] = '禁止访问';
@@ -151,7 +150,7 @@ $lang['Rating'] = '投票';
 $lang['Reject All'] = '取消所有修改';
 $lang['Reject'] = '取消';
 $lang['Representant'] = '代理人';
-$lang['Representation of categories'] = '类表现';
+$lang['Representation of albums'] = '类表现';
 $lang['Representative'] = '代理人';
 $lang['Represents'] = '代理';
 $lang['Save order'] = '保存排序';
@@ -184,7 +183,7 @@ $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 album in its own sub album'] = '你不能把类移到它本身子类中';
+$lang['You cannot move an album in its own sub album'] = '你不能把类移到它本身子类中';
 $lang['You need to confirm deletion'] = '你必须确认删除操作';
 $lang['add tags'] = '增加标签';
 $lang['Adviser'] = '顾问';
@@ -192,18 +191,17 @@ $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['Authorize users to add comments on selected albums'] = '允许用户对所选类发表评论';
 $lang['The name of an album must not be empty'] = '类名不能为空';
 $lang['Lock albums'] = '冻结类';
 $lang['Private'] = '私类';
 $lang['Public'] = '公类';
 $lang['Find a new representant by random'] = '随机寻找代理人';
 $lang['Public / Private'] = '公有 / 私有';
-$lang['Manage authorizations for selected categories'] = '管理所选类权限';
-$lang['Select uploadable categories'] = '选择上传类';
+$lang['Manage authorizations for selected albums'] = '管理所选类权限';
+$lang['Select uploadable albums'] = '选择上传类';
 $lang['Virtual album added'] = '虚拟类已加入';
 $lang['Virtual album deleted'] = '虚拟类已删除';
-$lang['Category'] = '类';
 $lang['Access type'] = '权限类型';
 $lang['Comments'] = '评论';
 $lang['Information data registered in database'] = '信息已保存到数据库中';
@@ -356,10 +354,10 @@ $lang['synchronize metadata'] = '同步元数据';
 $lang['target'] = '目标';
 $lang['Thumbnail'] = '缩略图';
 $lang['title'] = '标题';
-$lang['Categories management'] = '类管理';
+$lang['Album list management'] = '类管理';
 $lang['Piwigo configuration'] = '配置Piwigo';
 $lang['Piwigo administration'] = 'Piwigo管理员';
-$lang['Edit a category'] = '修改类';
+$lang['Edit album'] = '修改类';
 $lang['Group management'] = '组管理';
 $lang['User list'] = '用户名单';
 $lang['Modify informations about a picture'] = '修改图片信息';
@@ -390,9 +388,9 @@ $lang['unset'] = '清空';
 $lang['Update albums informations'] = '更新类信息';
 $lang['Update images informations'] = '更新图信息';
 $lang['Synchronize'] = '同步';
-$lang['reduce to single existing categories'] = '只能处理一个类';
+$lang['reduce to single existing albums'] = '只能处理一个类';
 $lang['Choose an option'] = '选择一个选项';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = '显示全部信息 (增加类, 增加图片, 删除类和图片)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = '显示全部信息 (增加类, 增加图片, 删除类和图片)';
 $lang['Piwigo version differs on the remote site'] = '与远端站点的Piwigo版本不相同';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = '与远端站点文件create_listing_file.php版本和Piwigo版本必须相同';
 $lang['listing.xml file was not found'] = '没有发现listing.xml文件';
@@ -404,12 +402,12 @@ $lang['File/directory read error'] = '文件/文件夹打开错误';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = '无法打开文件或文件夹(要么根本不存在,要么拒绝访问)';
 $lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = '每个图片文件需要一个缩略图.缩略图应该存在于类文件夹下的子文件夹"thumbnail"中. 缩略图文件名应该以设置参数"prefix_thumbnail"开始, 扩展名为:';
 $lang['missing thumbnail'] = '缺少缩略图';
-$lang['categories deleted in the database'] = '类已从数据库中删除';
+$lang['albums deleted in the database'] = '类已从数据库中删除';
 $lang['elements deleted in the database'] = '图片已从数据库中删除';
 $lang['images candidates for metadata synchronization'] = '对应同步元数据的候选图片';
 $lang['elements informations synchronized with files metadata'] = '附有元数据的同步图片信息informations des images synchronisées avec les méta-données';
 $lang['errors during synchronization'] = '同步期间发生错误';
-$lang['categories added in the database'] = '增加类到数据库';
+$lang['albums added in the database'] = '增加类到数据库';
 $lang['elements added in the database'] = '增加图片到数据库';
 $lang['elements updated in the database'] = '更新数据库中的图片';
 $lang['Search for new images in the directories'] = '查询文件中的新图片';
@@ -441,7 +439,7 @@ $lang['Toggle \'default group\' property'] = '赋予\'groupe par défaut\'默认
 $lang['Advanced features'] = '高级功能';
 $lang['Not linked elements'] = '无链接图片';
 $lang['Specials'] = '特殊';
-$lang['Files with same name in more than one physical category'] = '在好几个物理类中存在同名文件';
+$lang['Files with same name in more than one physical album'] = '在好几个物理类中存在同名文件';
 
 $lang['Overall'] = '全局视图';
 $lang['Year'] = '年';
@@ -589,7 +587,7 @@ $lang['Templates configuration has been recorded.'] = '模板设置已保存.';
 $lang['All optimizations have been successfully completed.'] = '优化成功.';
 $lang['Optimizations have been completed with some errors.'] = '有些优化发生错误.';
 $lang['Modify information'] = '修改信息';
-$lang['edit category informations'] = '编辑类信息';
+$lang['edit album'] = '编辑类信息';
 $lang['nothing'] = '没有内容';
 $lang['overrides existing values with empty ones'] = '用空数据来删除已存在的数据';
 $lang['manage image ranks'] = '管理图片排序';
@@ -631,18 +629,18 @@ $lang['Forbid this theme to users'] = '禁用此主题';
 $lang['Set as default theme for unregistered and new users'] = '设置为未注册者和新用户的默认主题';
 $lang['unknown'] = '未知';
 $lang['Upload Photos'] = '上传相片';
-$lang['Drop into category'] = '拖进类别';
+$lang['Drop into album'] = '拖进类别';
 $lang['+ Add an upload box'] = '+ 添加一个上传框';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = '在您的根目录下创建 "%s" 目录以完成 Piwigo 的安装';
 $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['existing album'] = '已存在类别';
+$lang['create a new album'] = '创建一个新类别';
 $lang['Album name'] = '类别名称';
-$lang['Category "%s" has been added'] = '类别 "%s" 已添加';
+$lang['Album "%s" has been added'] = '类别 "%s" 已添加';
 $lang['Uploaded Photos'] = '相片已上传';
 $lang['%d photos uploaded'] = '%d 相片已上传';
 $lang['Privacy level set to "%s"'] = '私有级别设置为 "%s"';
-$lang['Category "%s" now contains %d photos'] = '类别 "%s" 现已包含了 %d 相片';
+$lang['Album "%s" now contains %d photos'] = '类别 "%s" 现已包含了 %d 相片';
 $lang['Manage this set of %d photos'] = '管理此设置的 %d 张照片 ';
 $lang['Select files'] = '选择文件';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG 文件或者将 JPEG 文件放到一个 ZIP 档案里';
diff --git a/language/zh_CN/common.lang.php b/language/zh_CN/common.lang.php
index 833c76aa1..121b4a69e 100644
--- a/language/zh_CN/common.lang.php
+++ b/language/zh_CN/common.lang.php
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = '至少符合一项标准
 $lang['At least one tag must match'] = '至少匹配一个标签';
 $lang['Author'] = '拥有者';
 $lang['Average rate'] = '评分';
-$lang['Categories'] = '类';
-$lang['Category'] = '类';
+$lang['Albums'] = '类';
+$lang['Album'] = '类';
 $lang['Close this window'] = '关闭窗口';
 $lang['Complete RSS feed (images, comments)'] = '完整RSS回馈(图片, 评论等)';
 $lang['Confirm Password'] = '重复输入密码';