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

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

48 files changed, 507 insertions, 507 deletions

diff --git a/language/ar_SA/admin.lang.php b/language/ar_SA/admin.lang.php
index 5fb16ea8d..3c948922b 100644
--- a/language/ar_SA/admin.lang.php
+++ b/language/ar_SA/admin.lang.php
@@ -23,14 +23,14 @@
 
 $lang['%d association'] = '%d مجموعه';
 $lang['%d associations'] = '%d جمعيات';
-$lang['%d category including'] = '%d ألبوم متضمن ';
-$lang['%d categories including'] = '%d ألبومات متضامنه ';
+$lang['%d album including'] = '%d ألبوم متضمن ';
+$lang['%d albums including'] = '%d ألبومات متضامنه ';
 $lang['%d physical'] = '%d طبيعين';
 $lang['%d physical'] = '%d طبيعي';
 $lang[' and %d virtual'] = ' و %d افتراضي';
 $lang[' and %d virtual'] = ' و %d أفترضي';
-$lang['%d category moved'] = '%d نقل الألبوم';
-$lang['%d categories moved'] = '%d نقل الألبومات';
+$lang['%d album moved'] = '%d نقل الألبوم';
+$lang['%d albums moved'] = '%d نقل الألبومات';
 $lang['%d group'] = '%d مجموعه';
 $lang['%d groups'] = '%d مجموعات';
 $lang['%d member'] = '%d عدد';
@@ -600,7 +600,7 @@ $lang['overrides existing values with empty ones'] = 'overrides existing values
 $lang['manage image ranks'] = 'إدارة ترتيب الصور';
 $lang['Manage image ranks'] = 'إدارة ترتيب الصور';
 $lang['Edit ranks'] = 'تحرير الترتيب';
-$lang['No element in this category'] = 'لا يوجد صور في الالبوم';
+$lang['No element in this album'] = 'لا يوجد صور في الالبوم';
 $lang['Images manual order was saved'] = 'تم حفظ الصور المطلوبة يديويا';
 $lang['ranks'] = 'الترتيب';
 $lang['Drag to re-order'] = 'أسحب لتغيير';
diff --git a/language/ar_SA/common.lang.php b/language/ar_SA/common.lang.php
index b058ade45..6ea26956d 100644
--- a/language/ar_SA/common.lang.php
+++ b/language/ar_SA/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['zero_plural'] = true;
 
 $lang['%.2f (rated %d times)'] = '%.2f (قيمت %d مرة)';
 $lang['%d Kb'] = '%d كيلوبايت';
-$lang['%d category updated'] = '%d تصنيف محدث';
-$lang['%d categories updated'] = '%d تصنيفات محدثة';
+$lang['%d album updated'] = '%d تصنيف محدث';
+$lang['%d albums updated'] = '%d تصنيفات محدثة';
 $lang['%d comment to validate'] = '%d مصادقة التعليق';
 $lang['%d comments to validate'] = '%d مصادقة التعليقات';
 $lang['%d new comment'] = '%d تعليق جديد';
@@ -117,7 +117,7 @@ $lang['Sort by'] = 'ترتيب حسب ..';
 $lang['Sort order'] = 'طريقة العرض';
 $lang['Tag'] = 'كلمة دلائلية';
 $lang['Tags'] = 'الكلمات الدلائلية';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'استخدم خدمةالتغذية الراجعه RSS للحصول التحديثات الجديدة من تعليقات و اضافات في هذا الموقع';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'استخدم خدمةالتغذية الراجعه RSS للحصول التحديثات الجديدة من تعليقات و اضافات في هذا الموقع';
 $lang['Unknown feed identifier'] = 'التغذية غير معرفة';
 $lang['User comments'] = 'آخر التلعيقات في المعرض';
 $lang['Username'] = 'أسم المستخدم';
@@ -133,7 +133,7 @@ $lang['Adviser mode enabled'] = 'تمكين اسلوب الزوار';
 $lang['all'] = 'كل';
 $lang['ascending'] = 'تصاعدي';
 $lang['author(s) : %s'] = 'الكتاب(s) : %s';
-$lang['Expand all categories'] = 'عرض جميع الالبومات المتفرعه';
+$lang['Expand all albums'] = 'عرض جميع الالبومات المتفرعه';
 $lang['posted after %s (%s)'] = 'اضيفت بعد %s (%s)';
 $lang['posted before %s (%s)'] = 'اضيفت قبل %s (%s)';
 $lang['posted between %s (%s) and %s (%s)'] = 'اضيفت بين %s (%s) و %s (%s)';
@@ -192,15 +192,15 @@ $lang['Page generated in'] = 'صفحة أنشئت في ..';
 $lang['guest'] = 'ضيف';
 $lang['Hello'] = 'مرحبا بك.';
 $lang['available for administrators only'] = 'متاح للأدارين فقط';
-$lang['shows images at the root of this category'] = 'اعرض  جميع صور هذا الالبوم';
+$lang['shows images at the root of this album'] = 'اعرض  جميع صور هذا الالبوم';
 $lang['See last users comments'] = 'شاهد آخر التعليقات';
 $lang['customize the appareance of the gallery'] = 'تخصيص معلوماتك الشخصية';
 $lang['search'] = 'بحث';
 $lang['Home'] = 'الرئيسية';
 $lang['Identification'] = 'إدارة المستخدمين';
-$lang['in this category'] = 'في هذا الألبوم';
-$lang['in %d sub-category'] = 'في %d البوم فرعي';
-$lang['in %d sub-categories'] = 'في %d ألبومات فرعية';
+$lang['in this album'] = 'في هذا الألبوم';
+$lang['in %d sub-album'] = 'في %d البوم فرعي';
+$lang['in %d sub-albums'] = 'في %d ألبومات فرعية';
 $lang['included'] = 'مستدعى';
 $lang['Invalid password!'] = 'عفوا كلمة المرور غير صحيحة!';
 $lang['Language']='اللغة';
@@ -214,7 +214,7 @@ $lang['Maximum height must be a number superior to 50'] = 'يجب ان يكون
 $lang['Maximum width of the pictures'] = 'العرض الاقضى للصورة';
 $lang['Maximum width must be a number superior to 50'] = 'يجب ان يكون العرض الاقصى للصورة يتعدى الـ50';
 $lang['display a calendar by creation date'] = 'عرض التقويم حسب الألبومات';
-$lang['display all elements in all sub-categories'] = 'عرض جميع الصور ';
+$lang['display all elements in all sub-albums'] = 'عرض جميع الصور ';
 $lang['return to normal view mode'] = 'العودة لنمط العرض العادي';
 $lang['display a calendar by posted date'] = 'عرض التقويم حسب تاريخ الصورة المضافة';
 $lang['month'][10] = 'أكتوبر';
@@ -252,8 +252,8 @@ $lang['Preferences'] = 'التفضيلات';
 $lang['Previous'] = 'الصورة السابقة';
 $lang['Random pictures'] = 'صورة عشوائية';
 $lang['display a set of random pictures'] = 'عرض مجموعة من الصورة العشوائية';
-$lang['Recent categories'] = 'الألبومات الأخيرة';
-$lang['display recently updated categories'] = 'عرض احدث الألبومات الحالية';
+$lang['Recent albums'] = 'الألبومات الأخيرة';
+$lang['display recently updated albums'] = 'عرض احدث الألبومات الحالية';
 $lang['Recent period'] = 'الفترة الاخيرة';
 $lang['Recent pictures'] = 'الصور الاخيرة';
 $lang['display most recent pictures'] = 'عرض أحدث الصور';
@@ -271,7 +271,7 @@ $lang['remove this tag from the list'] = 'احذف هذه الكلمات من ا
 $lang['representative'] = 'صفه /نموذجي';
 $lang['return to homepage'] = 'عودة للصفحه الرئيسية';
 $lang['Search for Author'] = 'ابحث عن الكاتب';
-$lang['Search in Categories'] = 'ابحث في الألبومات';
+$lang['Search in albums'] = 'ابحث في الألبومات';
 $lang['Search by Date'] = 'بحث حسب التاريخ';
 $lang['Date'] = 'التاريح';
 $lang['End-Date'] = 'نهاية التاريح';
@@ -282,10 +282,10 @@ $lang['Search for any terms'] = 'بحث بواسطة أي بند';
 $lang['Empty query. No criteria has been entered.'] = 'الاسعلام فارغ .. ماذا تريد أن تفعل ؟!!.';
 $lang['Search Options'] = 'خيارات البحث';
 $lang['Search results'] = 'نتائج البحث ';
-$lang['Search in subcategories'] = 'بحث في الألبومات الفرعية';
+$lang['Search in sub-albums'] = 'بحث في الألبومات الفرعية';
 $lang['searched words : %s'] = 'نتيجة البحث حسب الكلمات .. : %s';
 $lang['Contact'] = 'إتصل بـ';
-$lang['set as category representative'] = 'تحديد فئة الصفة او النموذج';
+$lang['set as album representative'] = 'تحديد فئة الصفة او النموذج';
 $lang['Show number of comments'] = 'اظهر عدد التعليقات';
 $lang['Show number of hits'] = 'اظهرعدد الزيارت';
 $lang['slideshow'] = 'عرض الشرائح';
@@ -327,7 +327,7 @@ $lang['User: %s'] = 'المستخدم: %s';
 $lang['Email: %s'] = 'البريد الالكتروني: %s';
 $lang['Admin: %s'] = 'المدير: %s';
 $lang['Registration of %s'] = 'تسجيل  %s';
-$lang['Category: %s'] = 'الألبوم: %s';
+$lang['Album: %s'] = 'الألبوم: %s';
 $lang['Picture name: %s'] = 'اسم الصورة: %s';
 $lang['Creation date: %s'] = 'التاريخ الاصلي للصورة: %s';
 $lang['Waiting page: %s'] = 'صفحة تنتظر: %s';
@@ -337,7 +337,7 @@ $lang['Bad status for user "guest", using default status. Please notify the webm
 // --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'خاصية للادارة فقط لايمكنك استخدامها';
 $lang['a user use already this mail address'] = 'هذا البريد مسجل لدينامن قبل';
-$lang['Category results for'] = 'نتيجة البحث في الالبومات عن:';
+$lang['Album results for'] = 'نتيجة البحث في الالبومات عن:';
 $lang['Tag results for'] = 'نتائج الكلمات الدلائلية';
 $lang['from %s to %s'] = 'من%s الي %s';
 $lang['Play of slideshow'] = 'شغل عرض شرائح الصور';
diff --git a/language/cs_CZ/admin.lang.php b/language/cs_CZ/admin.lang.php
index fb7bc211f..393b89c25 100644
--- a/language/cs_CZ/admin.lang.php
+++ b/language/cs_CZ/admin.lang.php
@@ -26,14 +26,14 @@
 
 $lang['%d association'] = '%d spojení';
 $lang['%d associations'] = '%d spojení';
-$lang['%d category including'] = '%d kategorie obsahující ';
-$lang['%d categories including'] = '%d kategorií obsahujících ';
+$lang['%d album including'] = '%d kategorie obsahující ';
+$lang['%d albums including'] = '%d kategorií obsahujících ';
 $lang['%d physical'] = '%d fyzický';
 $lang['%d physical'] = '%d fyzických';
 $lang[' and %d virtual'] = 'a %d virtuální';
 $lang[' and %d virtual'] = 'a %d virtuálních';
-$lang['%d category moved'] = '%d kategorie přesunuta';
-$lang['%d categories moved'] = '%d kategorií přesunuto';
+$lang['%d album moved'] = '%d kategorie přesunuta';
+$lang['%d albums moved'] = '%d kategorií přesunuto';
 $lang['%d group'] = '%d skupina';
 $lang['%d groups'] = '%d skupin';
 $lang['%d member'] = '%d účastník';
@@ -599,7 +599,7 @@ $lang['overrides existing values with empty ones'] = 'nahradit stávající hodn
 $lang['manage image ranks'] = 'spravovat hodnocení fotografií';
 $lang['Manage image ranks'] = 'Spravovat hodnocení fotografií';
 $lang['Edit ranks'] = 'Upravit hodnocení';
-$lang['No element in this category'] = 'Kategorie neobsahuje žádné položky';
+$lang['No element in this album'] = 'Kategorie neobsahuje žádné položky';
 $lang['Images manual order was saved'] = 'Pořadí fotografií bylo uloženo';
 $lang['ranks'] = 'hodnocení';
 $lang['Drag to re-order'] = 'Pořadí změníte táhnutím myši';
diff --git a/language/cs_CZ/common.lang.php b/language/cs_CZ/common.lang.php
index 5a9a222eb..12f0af737 100644
--- a/language/cs_CZ/common.lang.php
+++ b/language/cs_CZ/common.lang.php
@@ -34,8 +34,8 @@ $lang_info['zero_plural'] = true;
 
 $lang['%.2f (rated %d times)'] = '%.2f (hodnoceno %d krát)';
 $lang['%d Kb'] = '%d Kb';
-$lang['%d category updated'] = '%d kategorie aktualizována';
-$lang['%d categories updated'] = '%d kategorie aktualizovány';
+$lang['%d album updated'] = '%d kategorie aktualizována';
+$lang['%d albums updated'] = '%d kategorie aktualizovány';
 $lang['%d comment to validate'] = '%d komentář k validaci';
 $lang['%d comments to validate'] = '%d komentářů k validaci';
 $lang['%d new comment'] = '%d nový komentář';
@@ -121,7 +121,7 @@ $lang['Sort by'] = 'Řadit podle';
 $lang['Sort order'] = 'Směr řazení';
 $lang['Tag'] = 'Klíčové slovo';
 $lang['Tags'] = 'Klíčová slova';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'RSS vlákno informuje o novinkách na těchto stránkách : nové fotografie, aktualizované kategorie, komentáře. Použijte RSS čtečku';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'RSS vlákno informuje o novinkách na těchto stránkách : nové fotografie, aktualizované kategorie, komentáře. Použijte RSS čtečku';
 $lang['Unknown feed identifier'] = 'Neznámý identifikátor vlákna';
 $lang['User comments'] = 'Komentáře uživatelů';
 $lang['Username'] = 'Uživatelské jméno';
@@ -137,7 +137,7 @@ $lang['Adviser mode enabled'] = 'Aktivován mód průvodce';
 $lang['all'] = 'vše';
 $lang['ascending'] = 'vzestupně';
 $lang['author(s) : %s'] = 'autor : %s';
-$lang['Expand all categories'] = 'Rozbalit všechny kategorie';
+$lang['Expand all albums'] = 'Rozbalit všechny kategorie';
 $lang['posted after %s (%s)'] = 'vloženo po %s (%s)';
 $lang['posted before %s (%s)'] = 'vloženo před %s (%s)';
 $lang['posted between %s (%s) and %s (%s)'] = 'vloženo mezi %s (%s) a %s (%s)';
@@ -193,15 +193,15 @@ $lang['Page generated in'] = 'Stránka vytvořena ';
 $lang['guest'] = 'host';
 $lang['Hello'] = 'Přihlášen jako';
 $lang['available for administrators only'] = 'Přístupné pouze adminitrátorům';
-$lang['shows images at the root of this category'] = 'Zobrazit fotografie v této kategorii';
+$lang['shows images at the root of this album'] = 'Zobrazit fotografie v této kategorii';
 $lang['See last users comments'] = 'Zobrazit nejnovější komentáře uživatelů';
 $lang['customize the appareance of the gallery'] = 'Přizpůsobit vzhled galerie';
 $lang['search'] = 'Hledat';
 $lang['Home'] = 'Úvodní stránka';
 $lang['Identification'] = 'Identifikace';
-$lang['in this category'] = 'v této kategorii';
-$lang['in %d sub-category'] = 'v %d pod-kategorii';
-$lang['in %d sub-categories'] = 'v %d pod-kategoriích';
+$lang['in this album'] = 'v této kategorii';
+$lang['in %d sub-album'] = 'v %d pod-kategorii';
+$lang['in %d sub-albums'] = 'v %d pod-kategoriích';
 $lang['included'] = 'včetně';
 $lang['Invalid password!'] = 'Špatné heslo!';
 $lang['Language'] = 'Jazyk';
@@ -215,7 +215,7 @@ $lang['Maximum height must be a number superior to 50'] = 'Maximální výška m
 $lang['Maximum width of the pictures'] = 'Maximální šířka fotografií';
 $lang['Maximum width must be a number superior to 50'] = 'Maximální šířka musí být číslo vetší než 50';
 $lang['display a calendar by creation date'] = 'Zobrazit v kalendáři podle datumu vytvoření';
-$lang['display all elements in all sub-categories'] = 'Zobrazit všechny objekty v pod-kategoriích';
+$lang['display all elements in all sub-albums'] = 'Zobrazit všechny objekty v pod-kategoriích';
 $lang['return to normal view mode'] = 'Návrat do normálního zobrazení';
 $lang['display a calendar by posted date'] = 'Zobrazit v kalendáři podle data vložení';
 $lang['month'][10] = 'Říjen';
@@ -253,8 +253,8 @@ $lang['Preferences'] = 'Nastavení';
 $lang['Previous'] = 'Předchozí';
 $lang['Random pictures'] = 'Náhodný výběr';
 $lang['display a set of random pictures'] = 'Zobrazit sadu fotografií podle náhodného výběru';
-$lang['Recent categories'] = 'Nové kategorie';
-$lang['display recently updated categories'] = 'Zobrazit nově přidané kategorie';
+$lang['Recent albums'] = 'Nové kategorie';
+$lang['display recently updated albums'] = 'Zobrazit nově přidané kategorie';
 $lang['Recent period'] = 'Doba, po kterou jsou fotografie zobrazeny jako nově přidané';
 $lang['Recent pictures'] = 'Nové fotografie';
 $lang['display most recent pictures'] = 'Zobrazit nově přidané fotografie';
@@ -270,7 +270,7 @@ $lang['remove this tag from the list'] = 'odstranit toto klíčové slovo ze sez
 $lang['representative'] = 'Reprezentant';
 $lang['return to homepage'] = 'Zpět na úvodní stranu';
 $lang['Search for Author'] = 'Hledat autora';
-$lang['Search in Categories'] = 'Hledání v kategoriích';
+$lang['Search in albums'] = 'Hledání v kategoriích';
 $lang['Search by Date'] = 'Hledat podle data přidání';
 $lang['Date'] = 'Od';
 $lang['End-Date'] = 'Do';
@@ -281,10 +281,10 @@ $lang['Search for any terms'] = 'Hledat všechny výrazy';
 $lang['Empty query. No criteria has been entered.'] = 'Neúplný dotaz. Nebyly zadány žádné podmínky pro vyhledávání.';
 $lang['Search Options'] = 'Kritéria vyhledávání';
 $lang['Search results'] = 'Výsledky vyhledávání';
-$lang['Search in subcategories'] = 'Hledat v podkategoriích';
+$lang['Search in sub-albums'] = 'Hledat v podkategoriích';
 $lang['searched words : %s'] = 'hledat slova : %s';
 $lang['Contact'] = 'Kontakt';
-$lang['set as category representative'] = 'Nastavit kategorii jako reprezentativní';
+$lang['set as album representative'] = 'Nastavit kategorii jako reprezentativní';
 $lang['Show number of comments'] = 'Ukázat počet komentářů';
 $lang['Show number of hits'] = 'Ukázat počet zobrazení';
 $lang['slideshow'] = 'Automatické přehrávání';
@@ -326,7 +326,7 @@ $lang['User: %s'] = 'Uživatel: %s';
 $lang['Email: %s'] = 'E-mail: %s';
 $lang['Admin: %s'] = 'Administrátor: %s';
 $lang['Registration of %s'] = 'Registrace %s';
-$lang['Category: %s'] = 'Kategorie: %s';
+$lang['Album: %s'] = 'Kategorie: %s';
 $lang['Picture name: %s'] = '*Název fotografie: %s';
 $lang['Creation date: %s'] = 'Datum vytvoření: %s';
 $lang['Waiting page: %s'] = 'Čekání na stránku: %s';
@@ -336,7 +336,7 @@ $lang['Bad status for user "guest", using default status. Please notify the webm
 
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrátor nemůže použít tuto metodu.';
 $lang['a user use already this mail address'] = 'Tato e-mailová adresa je již používána';
-$lang['Category results for'] = 'Výsledky pro kategorie';
+$lang['Album results for'] = 'Výsledky pro kategorie';
 $lang['Tag results for'] = 'Výsledky pro klíčová slova';
 $lang['from %s to %s'] = 'od %s do %s';
 $lang['Play of slideshow'] = 'Spustit prezentaci';
diff --git a/language/da_DK/admin.lang.php b/language/da_DK/admin.lang.php
index 8ee2d07e1..2d98afc79 100644
--- a/language/da_DK/admin.lang.php
+++ b/language/da_DK/admin.lang.php
@@ -25,14 +25,14 @@
 
 $lang['%d association'] = '%d tilknytning';
 $lang['%d associations'] = '%d tilknytninger';
-$lang['%d category including'] = '%d Kategori inklusiv';
-$lang['%d categories including'] = '%d kategorier inklusiv';
+$lang['%d album including'] = '%d Kategori inklusiv';
+$lang['%d albums including'] = '%d kategorier inklusiv';
 $lang['%d physical'] = '%d Fysisk';
 $lang['%d physical'] = '%d Fysisk';
 $lang[' and %d virtual'] = ' Og  %d virtuel';
 $lang[' and %d virtual'] = ' Og  %d virtuel';
-$lang['%d category moved'] = '%d Kategori flyttet';
-$lang['%d categories moved'] = ' %d kategorier flyttet';
+$lang['%d album moved'] = '%d Kategori flyttet';
+$lang['%d albums moved'] = ' %d kategorier flyttet';
 $lang['%d group'] = '%d Gruppe';
 $lang['%d groups'] = '%d grupper';
 $lang['%d member'] = '%d medlem';
@@ -599,7 +599,7 @@ $lang['overrides existing values with empty ones']     =     'Tilsidesætter eks
 $lang['manage image ranks']     =     'Styre image ranking';
 $lang['Manage image ranks']     =     'Administrer image ranking';
 $lang['Edit ranks']     =     'Edit rækker';
-$lang['No element in this category']     =     'Ingen element i denne Kategori';
+$lang['No element in this album']     =     'Ingen element i denne Kategori';
 $lang['Images manual order was saved']     =     'Billeder manual gemt orden';
 $lang['ranks']     =     'Rangerer';
 $lang['Drag to re-order']     =     'Klik-og-træk for at re-order';
diff --git a/language/da_DK/common.lang.php b/language/da_DK/common.lang.php
index 9f7ed30ab..ee5b557de 100644
--- a/language/da_DK/common.lang.php
+++ b/language/da_DK/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['zero_plural'] = true;
 
 $lang['%.2f (rated %d times)'] = '%.2f (bedømt %d gange)';
 $lang['%d Kb'] = '%d Kb';
-$lang['%d category updated'] = '%d kategori opdateret';
-$lang['%d categories updated'] = '%d kategorier opdateret';
+$lang['%d album updated'] = '%d kategori opdateret';
+$lang['%d albums updated'] = '%d kategorier opdateret';
 $lang['%d comment to validate'] = '%d kommentar til validering';
 $lang['%d comments to validate'] = '%d kommentarer til validering';
 $lang['%d new comment'] = '%d ny kommentar';
@@ -117,7 +117,7 @@ $lang['Sort by'] = 'Sorter ';
 $lang['Sort order'] = 'Sorterings orden';
 $lang['Tag'] = 'Tag';
 $lang['Tags'] = 'Tags';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'RSS feed giver besked om nyheder fra denne side : nye fotos, opdaterede kategorier, nye kommentarer. Brug em RSS læser.';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'RSS feed giver besked om nyheder fra denne side : nye fotos, opdaterede kategorier, nye kommentarer. Brug em RSS læser.';
 $lang['Unknown feed identifier'] = 'Ukendt feed identifikation';
 $lang['User comments'] = 'Bruger kommentarer';
 $lang['Username'] = 'Brugernavn';
@@ -133,7 +133,7 @@ $lang['Adviser mode enabled'] = 'Rådgivnings mode aktiveret';
 $lang['all'] = 'alle';
 $lang['ascending'] = 'venter';
 $lang['author(s) : %s'] = 'forfatter(e) : %s';
-$lang['Expand all categories'] = 'Udvid alle kategorier';
+$lang['Expand all albums'] = 'Udvid alle kategorier';
 $lang['posted after %s (%s)'] = 'posted efter %s (%s)';
 $lang['posted before %s (%s)'] = 'posted før %s (%s)';
 $lang['posted between %s (%s) and %s (%s)'] = 'posted mellem %s (%s) og %s (%s)';
@@ -189,15 +189,15 @@ $lang['Page generated in'] = 'Siden er genereret på';
 $lang['guest'] = 'gæst';
 $lang['Hello'] = 'Hej';
 $lang['available for administrators only'] = 'kun tilgængelig for administrator';
-$lang['shows images at the root of this category'] = 'viser billeder til grund for denne kategori';
+$lang['shows images at the root of this album'] = 'viser billeder til grund for denne kategori';
 $lang['See last users comments'] = 'Se sidste brugers kommentarer';
 $lang['customize the appareance of the gallery'] = 'tilpas visningen af dette galleri';
 $lang['search'] = 'søg';
 $lang['Home'] = 'Hjem';
 $lang['Identification'] = 'Identifikation';
-$lang['in this category'] = 'i denne kategori';
-$lang['in %d sub-category'] = 'i %d sub-kategori';
-$lang['in %d sub-categories'] = 'i %d sub-kategorier';
+$lang['in this album'] = 'i denne kategori';
+$lang['in %d sub-album'] = 'i %d sub-kategori';
+$lang['in %d sub-albums'] = 'i %d sub-kategorier';
 $lang['included'] = 'inkuderet';
 $lang['Invalid password!'] = 'Forkert password!';
 $lang['Language']='Sprog';
@@ -211,7 +211,7 @@ $lang['Maximum height must be a number superior to 50'] = 'Maksimum højde skal
 $lang['Maximum width of the pictures'] = 'Maksimum bredde på fotos';
 $lang['Maximum width must be a number superior to 50'] = 'Maksimum bredde skal være højere end 50';
 $lang['display a calendar by creation date'] = 'viser en kalender med oprettelses datoer';
-$lang['display all elements in all sub-categories'] = 'viser alle elementer i alle sub-kategorier';
+$lang['display all elements in all sub-albums'] = 'viser alle elementer i alle sub-kategorier';
 $lang['return to normal view mode'] = 'tilbage til normal visning';
 $lang['display a calendar by posted date'] = 'viser en kalender med oprettelse datoer';
 $lang['month'][10] = 'Oktober';
@@ -249,8 +249,8 @@ $lang['Preferences'] = 'Præferencer';
 $lang['Previous'] = 'Tidligere';
 $lang['Random pictures'] = 'Tilfældig foto';
 $lang['display a set of random pictures'] = 'Vis tilfældig fotos';
-$lang['Recent categories'] = 'Nye kategorier';
-$lang['display recently updated categories'] = 'Vis nyopdaterede kategorier';
+$lang['Recent albums'] = 'Nye kategorier';
+$lang['display recently updated albums'] = 'Vis nyopdaterede kategorier';
 $lang['Recent period'] = 'Sidste periode';
 $lang['Recent pictures'] = 'Nye fotos';
 $lang['display most recent pictures'] = 'Vis nyeste fotos';
@@ -266,7 +266,7 @@ $lang['remove this tag from the list'] = 'fjern dette tag fra denne liste';
 $lang['representative'] = 'repræsentativ';
 $lang['return to homepage'] = 'tilbage til startsiden';
 $lang['Search for Author'] = 'søg for Author';
-$lang['Search in Categories'] = 'søg in kategorier';
+$lang['Search in albums'] = 'søg in kategorier';
 $lang['Search by Date'] = 'søg efter dato';
 $lang['Date'] = 'Dato';
 $lang['End-Date'] = 'Slut-Dato';
@@ -277,10 +277,10 @@ $lang['Search for any terms'] = 'søg efter alle';
 $lang['Empty query. No criteria has been entered.'] = 'Tom forespørgsel. Ingen kriterier er indtastet.';
 $lang['Search Options'] = 'søge muligheder';
 $lang['Search results'] = 'søge resulter';
-$lang['Search in subcategories'] = 'søg i subkategorier';
+$lang['Search in sub-albums'] = 'søg i subkategorier';
 $lang['searched words : %s'] = 'søgte ord : %s';
 $lang['Contact'] = 'kontakt';
-$lang['set as category representative'] = 'set as kategori representative';
+$lang['set as album representative'] = 'set as kategori representative';
 $lang['Show number of comments'] = 'Vis antallet af kommentarer';
 $lang['Show number of hits'] = 'Vis antallet hits';
 $lang['slideshow'] = 'slideshow';
@@ -322,7 +322,7 @@ $lang['User: %s'] = 'Bruger: %s';
 $lang['Email: %s'] = 'Email: %s';
 $lang['Admin: %s'] = 'Admin: %s';
 $lang['Registration of %s'] = 'Registrering af %s';
-$lang['Category: %s'] = 'kategori: %s';
+$lang['Album: %s'] = 'kategori: %s';
 $lang['Picture name: %s'] = 'Foto navn: %s';
 $lang['Creation date: %s'] = 'Oprettelses dag: %s';
 $lang['Waiting page: %s'] = 'ventende side: %s';
@@ -332,7 +332,7 @@ $lang['Bad status for user "guest", using default status. Please notify the webm
 // --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webmaster and specielle brugere akn ikke bruge denne metode';
 $lang['a user use already this mail address'] = 'en bruger bruger allerede denne mail addresse';
-$lang['Category results for'] = 'kategori resulter for';
+$lang['Album results for'] = 'kategori resulter for';
 $lang['Tag results for'] = 'Tag resulter for';
 $lang['from %s to %s'] = 'fra %s til %s';
 $lang['Play of slideshow'] = 'Afspil slideshow';
diff --git a/language/de_DE/admin.lang.php b/language/de_DE/admin.lang.php
index 938e852e8..b22a2a282 100644
--- a/language/de_DE/admin.lang.php
+++ b/language/de_DE/admin.lang.php
@@ -23,14 +23,14 @@
 
 $lang['%d association'] = '%d Element wird insgesamt angezeigt (physisch und virtuell)';
 $lang['%d associations'] = '%d Elemente werden insgesamt angezeigt (physisch und virtuell)';
-$lang['%d category including'] = '%d Kategorie enthalten';
-$lang['%d categories including'] = '%d Kategorien enthalten ';
+$lang['%d album including'] = '%d Kategorie enthalten';
+$lang['%d albums including'] = '%d Kategorien enthalten ';
 $lang['%d physical'] = '%d physisch';
 $lang['%d physical'] = '%d physische';
 $lang[' and %d virtual'] = ' und %d virtuell';
 $lang[' and %d virtual'] = ' und %d virtuelle';
-$lang['%d category moved'] = '%d Kategorie verschoben';
-$lang['%d categories moved'] = '%d Kategorien verschoben';
+$lang['%d album moved'] = '%d Kategorie verschoben';
+$lang['%d albums moved'] = '%d Kategorien verschoben';
 $lang['%d group'] = '%d Gruppe';
 $lang['%d groups'] = '%d Gruppe';
 $lang['%d member'] = '%d Mitglied';
@@ -596,7 +596,7 @@ $lang['overrides existing values with empty ones'] = 'Löscht alle Werte in der
 $lang['manage image ranks'] = 'Verwaltung der Reihenfolge der Bilder';
 $lang['Manage image ranks'] = 'Verwalten Sie die Reihenfolge der Bilder';
 $lang['Edit ranks'] = 'Die Reihenfolge ändern';
-$lang['No element in this category'] = 'Kein Element in dieser Kategorie';
+$lang['No element in this album'] = 'Kein Element in dieser Kategorie';
 $lang['Images manual order was saved'] = 'Die manuelle Reihenfolge der Bilder wurde gespeichert';
 $lang['ranks'] = 'Reihenfolge';
 $lang['Drag to re-order'] = 'Klicken und Ziehen um eine neue Reihenfolge festzulegen';
diff --git a/language/de_DE/common.lang.php b/language/de_DE/common.lang.php
index b9aa1ae91..56189000f 100644
--- a/language/de_DE/common.lang.php
+++ b/language/de_DE/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['zero_plural'] = false;
 
 $lang['%.2f (rated %d times)'] = '%.2f (beachtet %d mal)';
 $lang['%d Kb'] = '%d Kb';
-$lang['%d category updated'] = '%d Kategorie wurde aktualisiert';
-$lang['%d categories updated'] = '%d Kategorien wurden aktualisiert';
+$lang['%d album updated'] = '%d Kategorie wurde aktualisiert';
+$lang['%d albums updated'] = '%d Kategorien wurden aktualisiert';
 $lang['%d comment to validate'] = '%d Kommentar freizuschalten';
 $lang['%d comments to validate'] = '%d Kommentare freizuschalten';
 $lang['%d new comment'] = '%d neuer Kommentar';
@@ -117,7 +117,7 @@ $lang['Sort by'] = 'Sortieren nach';
 $lang['Sort order'] = 'Sortierreihenfolge';
 $lang['Tag'] = 'Tag';
 $lang['Tags'] = 'Tags';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'Der RSS-Feed teilt die Ereignisse in der Galerie mit: neue Bilder, Gruppen-Updates, neue Benutzer Kommentare. Für die Verwendung mit einem RSS-Reader.';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'Der RSS-Feed teilt die Ereignisse in der Galerie mit: neue Bilder, Gruppen-Updates, neue Benutzer Kommentare. Für die Verwendung mit einem RSS-Reader.';
 $lang['Unknown feed identifier'] = 'Feed-ID unbekanntem';
 $lang['User comments'] = 'Benutzerkommentare';
 $lang['Username'] = 'Benutzername';
@@ -133,7 +133,7 @@ $lang['Adviser mode enabled'] = 'Berater-Modus aktiv';
 $lang['all'] = 'alle';
 $lang['ascending'] = 'wachsende';
 $lang['author(s) : %s'] = 'Autor(en) : %s';
-$lang['Expand all categories'] = 'Kategoriebaum immer vollständig sichtbar';
+$lang['Expand all albums'] = 'Kategoriebaum immer vollständig sichtbar';
 $lang['posted after %s (%s)'] = 'zur Verfügung gestellt nachdem die %s (%s)';
 $lang['posted before %s (%s)'] = 'zur Verfügung gestellt, bevor die %s (%s)';
 $lang['posted between %s (%s) and %s (%s)'] = 'zur Verfügung gestellt von %s (%s) und das %s (%s)';
@@ -189,15 +189,15 @@ $lang['Page generated in'] = 'Seite erstellt in';
 $lang['guest'] = 'Besucher';
 $lang['Hello'] = 'Hallo';
 $lang['available for administrators only'] = 'nur für Administratoren';
-$lang['shows images at the root of this category'] = 'zeigt die Bilder an der Wurzel dieser Kategorie';
+$lang['shows images at the root of this album'] = 'zeigt die Bilder an der Wurzel dieser Kategorie';
 $lang['See last users comments'] = 'Zeige die letzten Kommentare Benutzer';
 $lang['customize the appareance of the gallery'] = 'das Aussehen der Galerie';
 $lang['search'] = 'Suche';
 $lang['Home'] = 'Startseite';
 $lang['Identification'] = 'Identifikation';
-$lang['in this category'] = 'in dieser Kategorie';
-$lang['in %d sub-category'] = 'in %d Unterkategorie';
-$lang['in %d sub-categories'] = 'in %d Unterkategorien';
+$lang['in this album'] = 'in dieser Kategorie';
+$lang['in %d sub-album'] = 'in %d Unterkategorie';
+$lang['in %d sub-albums'] = 'in %d Unterkategorien';
 $lang['included'] = 'enthalten';
 $lang['Invalid password!'] = 'Passwort ungültig!';
 $lang['Language'] = 'Sprache';
@@ -211,7 +211,7 @@ $lang['Maximum height must be a number superior to 50'] = 'Die maximale Höhe de
 $lang['Maximum width of the pictures'] = 'Maximale Breite der Bilder';
 $lang['Maximum width must be a number superior to 50'] = 'Die Breite der Bilder muss mehr als 50';
 $lang['display a calendar by creation date'] = 'zeige einen Kalender nach Erstellungsdatum';
-$lang['display all elements in all sub-categories'] = 'Zeige alle Bilder inclusive der Unterkategorien';
+$lang['display all elements in all sub-albums'] = 'Zeige alle Bilder inclusive der Unterkategorien';
 $lang['return to normal view mode'] = 'Zurück zur normalen Ansicht';
 $lang['display a calendar by posted date'] = 'zeige einen Kalender nach Einstellungsdatum';
 $lang['month'][10] = 'Oktober';
@@ -249,8 +249,8 @@ $lang['Preferences'] = 'Einstellungen';
 $lang['Previous'] = 'Zurück';
 $lang['Random pictures'] = 'Zufallsbilder';
 $lang['display a set of random pictures'] = 'Anzeigen eines zufälligen Bilder';
-$lang['Recent categories'] = 'Neue Kategorien';
-$lang['display recently updated categories'] = 'Kategorien anzuzeigen, die kürzlich aktualisiert oder erstellt wurden';
+$lang['Recent albums'] = 'Neue Kategorien';
+$lang['display recently updated albums'] = 'Kategorien anzuzeigen, die kürzlich aktualisiert oder erstellt wurden';
 $lang['Recent period'] = 'Wieviele Tage sollen Bilder als "neu" markiert werden?';
 $lang['Recent pictures'] = 'Die neuesten Bilder';
 $lang['display most recent pictures'] = 'zeigt die neuesten Bilder';
@@ -266,7 +266,7 @@ $lang['remove this tag from the list'] = 'entfernen diesem Tag in der Liste';
 $lang['representative'] = 'representativ';
 $lang['return to homepage'] = 'Zurück zur Homepage';
 $lang['Search for Author'] = 'Suche nach Autor';
-$lang['Search in Categories'] = 'Suche in Kategorien';
+$lang['Search in albums'] = 'Suche in Kategorien';
 $lang['Search by Date'] = 'Suche nach Datum';
 $lang['Date'] = 'Datum';
 $lang['End-Date'] = 'Enddatum';
@@ -277,10 +277,10 @@ $lang['Search for any terms'] = 'Wörter suchen';
 $lang['Empty query. No criteria has been entered.'] = 'Abfrage leer. Kein Kriterium zur Verfügung.';
 $lang['Search Options'] = 'Suchoptionen';
 $lang['Search results'] = 'Suchergebnisse';
-$lang['Search in subcategories'] = 'Suche in Unterkategorien';
+$lang['Search in sub-albums'] = 'Suche in Unterkategorien';
 $lang['searched words : %s'] = 'Suchbegriffe : %s';
 $lang['Contact'] = 'Kontakt';
-$lang['set as category representative'] = 'Als Vorschaubild dieser Kategorie';
+$lang['set as album representative'] = 'Als Vorschaubild dieser Kategorie';
 $lang['Show number of comments'] = 'Zeige die Anzahl der Kommentare';
 $lang['Show number of hits'] = 'Zeige die Anzahl der Bildaufrufe';
 $lang['slideshow'] = 'Diashow';
@@ -322,7 +322,7 @@ $lang['User: %s'] = 'Benutzer: %s';
 $lang['Email: %s'] = 'E-Mail: %s';
 $lang['Admin: %s'] = 'Verwaltung: %s';
 $lang['Registration of %s'] = 'Registrierung von %s';
-$lang['Category: %s'] = 'Kategorie: %s';
+$lang['Album: %s'] = 'Kategorie: %s';
 $lang['Picture name: %s'] = 'Name des Bildes: %s';
 $lang['Creation date: %s'] = 'Erstellungsdatum: %d';
 $lang['Waiting page: %s'] = 'Seite warten: %s';
@@ -332,7 +332,7 @@ $lang['Bad status for user "guest", using default status. Please notify the webm
 // --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, Webmaster und spezieller Benutzer können nicht diese Methode verwenden';
 $lang['a user use already this mail address'] = 'Diese E-Mail-Adresse wird bereits verwendet';
-$lang['Category results for'] = 'Ergebnisse der Kategorien für';
+$lang['Album results for'] = 'Ergebnisse der Kategorien für';
 $lang['Tag results for'] = 'Ergebnisse der Tag für';
 $lang['from %s to %s'] = 'von %s bis %s';
 $lang['Play of slideshow'] = 'Start der Diashow';
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index d6ea94d50..07d6aae25 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -25,14 +25,14 @@
 
 $lang['%d association'] = "%d association";
 $lang['%d associations'] = "%d associations";
-$lang['%d category including'] = "%d category including";
-$lang['%d categories including'] = "%d categories including";
+$lang['%d album including'] = "%d album including";
+$lang['%d albums including'] = "%d albums including";
 $lang['%d physical'] = " %d physical";
 $lang['%d physical'] = " %d physical";
 $lang[' and %d virtual'] = " and %d virtual";
 $lang[' and %d virtual'] = " and %d virtual";
-$lang['%d category moved'] = "%d category moved";
-$lang['%d categories moved'] = "%d categories moved";
+$lang['%d album moved'] = "%d album moved";
+$lang['%d albums moved'] = "%d albums moved";
 $lang['%d group'] = "%d group";
 $lang['%d groups'] = "%d groups";
 $lang['%d member'] = "%d member";
@@ -598,7 +598,7 @@ $lang['overrides existing values with empty ones'] = "overrides existing values
 $lang['manage image ranks'] = "manage image ranks";
 $lang['Manage image ranks'] = "Manage image ranks";
 $lang['Edit ranks'] = "Edit ranks";
-$lang['No element in this category'] = "No element in this category";
+$lang['No element in this album'] = "No element in this album";
 $lang['Images manual order was saved'] = "Images manual order saved";
 $lang['ranks'] = "ranks";
 $lang['By rank'] = 'By rank';
diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index b89fb3e24..9a6e7e34b 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['zero_plural'] = "1";
 
 $lang['%.2f (rated %d times)'] = "%.2f (rated %d times)";
 $lang['%d Kb'] = "%d Kb";
-$lang['%d category updated'] = "%d category updated";
-$lang['%d categories updated'] = "%d categories updated";
+$lang['%d album updated'] = "%d album updated";
+$lang['%d albums updated'] = "%d albums updated";
 $lang['%d comment to validate'] = "%d comment to validate";
 $lang['%d comments to validate'] = "%d comments to validate";
 $lang['%d new comment'] = "%d new comment";
@@ -116,7 +116,7 @@ $lang['Sort by'] = "Sort by";
 $lang['Sort order'] = "Sort order";
 $lang['Tag'] = "Tag";
 $lang['Tags'] = "Tags";
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = "The RSS feed provides notification on new events from this website: new pictures, updated categories, new comments. To be used with a RSS feed reader.";
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = "The RSS feed provides notification on new events from this website: new pictures, updated albums, new comments. To be used with a RSS feed reader.";
 $lang['Unknown feed identifier'] = "Unknown feed identifier";
 $lang['User comments'] = "User comments";
 $lang['Username'] = "Username";
@@ -132,7 +132,7 @@ $lang['Adviser mode enabled'] = "Adviser mode enabled";
 $lang['all'] = "all";
 $lang['ascending'] = "ascending";
 $lang['author(s) : %s'] = "author(s) : %s";
-$lang['Expand all categories'] = "Expand all categories";
+$lang['Expand all albums'] = "Expand all albums";
 $lang['posted after %s (%s)'] = "posted after %s (%s)";
 $lang['posted before %s (%s)'] = "posted before %s (%s)";
 $lang['posted between %s (%s) and %s (%s)'] = "posted between %s (%s) and %s (%s)";
@@ -188,15 +188,15 @@ $lang['Page generated in'] = "Page generated in";
 $lang['guest'] = "guest";
 $lang['Hello'] = "Hello";
 $lang['available for administrators only'] = "available for administrators only";
-$lang['shows images at the root of this category'] = "shows images at the root of this category";
+$lang['shows images at the root of this album'] = "shows images at the root of this album";
 $lang['See last users comments'] = "See last users comments";
 $lang['customize the appareance of the gallery'] = "customize the look of the gallery";
 $lang['search'] = "search";
 $lang['Home'] = "Home";
 $lang['Identification'] = "Identification";
-$lang['in this category'] = "in this category";
-$lang['in %d sub-category'] = "in %d sub-category";
-$lang['in %d sub-categories'] = "in %d sub-categories";
+$lang['in this album'] = "in this album";
+$lang['in %d sub-album'] = "in %d sub-album";
+$lang['in %d sub-albums'] = "in %d sub-albums";
 $lang['included'] = "included";
 $lang['Invalid password!'] = "Invalid password!";
 $lang['Language'] = "Language";
@@ -210,7 +210,7 @@ $lang['Maximum height must be a number superior to 50'] = "Maximum height must b
 $lang['Maximum width of the pictures'] = "Pictures maximum width";
 $lang['Maximum width must be a number superior to 50'] = "Maximum width must be a number greater than 50";
 $lang['display a calendar by creation date'] = "display a calendar by creation date";
-$lang['display all elements in all sub-categories'] = "display all elements in all categories and sub-categories";
+$lang['display all elements in all sub-albums'] = "display all elements in all sub-albums";
 $lang['return to normal view mode'] = "return to normal view mode";
 $lang['display a calendar by posted date'] = "display a calendar by posted date";
 $lang['month'][10] = "October";
@@ -248,8 +248,8 @@ $lang['Preferences'] = "Preferences";
 $lang['Previous'] = "Previous";
 $lang['Random pictures'] = "Random pictures";
 $lang['display a set of random pictures'] = "display a set of random pictures";
-$lang['Recent categories'] = "Recent categories";
-$lang['display recently updated categories'] = "display recently updated categories";
+$lang['Recent albums'] = "Recent albums";
+$lang['display recently updated albums'] = "display recently updated albums";
 $lang['Recent period'] = "Recent period";
 $lang['Recent pictures'] = "Recent pictures";
 $lang['display most recent pictures'] = "display most recent pictures";
@@ -265,7 +265,7 @@ $lang['remove this tag from the list'] = "remove this tag from the list";
 $lang['representative'] = "representative";
 $lang['return to homepage'] = "return to home page";
 $lang['Search for Author'] = "Search for an author";
-$lang['Search in Categories'] = "Search in categories";
+$lang['Search in albums'] = "Search in albums";
 $lang['Search by Date'] = "Search by date";
 $lang['Date'] = "Date";
 $lang['End-Date'] = "End date";
@@ -276,10 +276,10 @@ $lang['Search for any terms'] = "Search for any term";
 $lang['Empty query. No criteria has been entered.'] = "Empty query. No criteria has been entered.";
 $lang['Search Options'] = "Search options";
 $lang['Search results'] = "Search results";
-$lang['Search in subcategories'] = "Search in subcategories";
+$lang['Search in sub-albums'] = "Search in sub-albums";
 $lang['searched words : %s'] = "searched words : %s";
 $lang['Contact'] = "Contact";
-$lang['set as category representative'] = "set as category representative";
+$lang['set as album representative'] = "set as album representative";
 $lang['Show number of comments'] = "Show number of comments";
 $lang['Show number of hits'] = "Show number of hits";
 $lang['slideshow'] = "slideshow";
@@ -321,7 +321,7 @@ $lang['User: %s'] = "User: %s";
 $lang['Email: %s'] = "Email: %s";
 $lang['Admin: %s'] = "Admin: %s";
 $lang['Registration of %s'] = "Registration of %s";
-$lang['Category: %s'] = "Category: %s";
+$lang['Album: %s'] = "Album: %s";
 $lang['Picture name: %s'] = "Picture name: %s";
 $lang['Creation date: %s'] = "Creation date: %s";
 $lang['Waiting page: %s'] = "Awaiting page: %s";
@@ -329,7 +329,7 @@ $lang['Picture uploaded by %s'] = "Picture uploaded by %s";
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = "Bad status for user \"guest\", default status will be used. Please notify the webmaster.";
 $lang['Administrator, webmaster and special user cannot use this method'] = "Administrator, webmaster and special user cannot use this method";
 $lang['a user use already this mail address'] = "another user already use this mail address";
-$lang['Category results for'] = "Category results for";
+$lang['Album results for'] = "Album results for";
 $lang['Tag results for'] = "Tag results for";
 $lang['from %s to %s'] = "from %s to %s";
 $lang['Play of slideshow'] = "Play slideshow";
diff --git a/language/en_UK/help/configuration.html b/language/en_UK/help/configuration.html
index eba6f2a3a..d0bdd99ce 100644
--- a/language/en_UK/help/configuration.html
+++ b/language/en_UK/help/configuration.html
@@ -108,7 +108,7 @@ users.</p>
   <li><strong>Recent period</strong>: By days. Period during which a picture is
   shown as new. Must be greater than 1 day.</li>
 
-  <li><strong>Expand all categories</strong>: Expand all categories by
+  <li><strong>Expand all albums</strong>: Expand all albums by
   default in the menu <em>Warning</em>: this option is resources consuming
   and may generate a huge menu if your category tree contains many
   categories.</li>
diff --git a/language/en_UK/help/search.html b/language/en_UK/help/search.html
index a1ec9357a..cdb296aa9 100644
--- a/language/en_UK/help/search.html
+++ b/language/en_UK/help/search.html
@@ -16,7 +16,7 @@
   if you want to make a "before" query. The year in the last
   field must be entered in the following format : AAAA (i.e. 2004)</dd>
 
-  <dt>Search in Categories</dt>
+  <dt>Search in albums</dt>
   <dd>Select category or categories you wish to search. All
   subcategories can be searched by selecting the parent category and setting enable
   search subcategories below.</dd>
diff --git a/language/es_AR/common.lang.php b/language/es_AR/common.lang.php
index 3c43cfaa3..69ef59c61 100644
--- a/language/es_AR/common.lang.php
+++ b/language/es_AR/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['zero_plural'] = false;
 
 $lang['%.2f (rated %d times)'] = '%.2f (marcado %d veces)';
 $lang['%d Kb'] = '%d Kb';
-$lang['%d category updated'] = '%d categoría actualizada';
-$lang['%d categories updated'] = '%d categorías actualizadas';
+$lang['%d album updated'] = '%d categoría actualizada';
+$lang['%d albums updated'] = '%d categorías actualizadas';
 $lang['%d comment to validate'] = '%d comentario de usuario para aprobar';
 $lang['%d comments to validate'] = '%d comentarios de usuario para aprobar';
 $lang['%d new comment'] = '%d nuevo comentario de usuario';
@@ -117,7 +117,7 @@ $lang['Sort by'] = 'Clasificar por';
 $lang['Sort order'] = 'Orden de clasificación';
 $lang['Tag'] = 'Etiqueta';
 $lang['Tags'] = 'Etiquetas';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'El flujo RSS notifica eventos de la galería: imágenes nuevas, categorías actualizadas, nuevos comentarios de usuarios. Debe usarse con un lector de flujos RSS.';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'El flujo RSS notifica eventos de la galería: imágenes nuevas, categorías actualizadas, nuevos comentarios de usuarios. Debe usarse con un lector de flujos RSS.';
 $lang['Unknown feed identifier'] = 'Identificador de flujo desconocido';
 $lang['User comments'] = 'Comentarios de usuario';
 $lang['Username'] = 'Nombre de usuario';
@@ -133,7 +133,7 @@ $lang['Adviser mode enabled'] = 'Modo asesor activo';
 $lang['all'] = 'todo';
 $lang['ascending'] = 'creciente';
 $lang['author(s) : %s'] = 'autor(es) : %s';
-$lang['Expand all categories'] = 'Mostrar todas las categorías';
+$lang['Expand all albums'] = 'Mostrar todas las categorías';
 $lang['posted after %s (%s)'] = 'a disposición después del %s (%s)';
 $lang['posted before %s (%s)'] = 'a disposición antes del %s (%s)';
 $lang['posted between %s (%s) and %s (%s)'] = 'a disposición entre el %s (%s) y el %s (%s)';
@@ -189,15 +189,15 @@ $lang['Page generated in'] = 'Página generada en ';
 $lang['guest'] = 'visitante';
 $lang['Hello'] = '¡Hola!';
 $lang['available for administrators only'] = 'sólo disponible para administradores';
-$lang['shows images at the root of this category'] = 'muestra las imágenes a la raíz de esta categoría';
+$lang['shows images at the root of this album'] = 'muestra las imágenes a la raíz de esta categoría';
 $lang['See last users comments'] = 'Ver los últimos comentarios de usuarios';
 $lang['customize the appareance of the gallery'] = 'personalizar la apariencia de la galería';
 $lang['search'] = 'búsqueda';
 $lang['Home'] = 'Inicio';
 $lang['Identification'] = 'Identificación';
-$lang['in this category'] = 'en esta categoría';
-$lang['in %d sub-category'] = 'en %d sub-categoría';
-$lang['in %d sub-categories'] = 'en %d sub-categorías';
+$lang['in this album'] = 'en esta categoría';
+$lang['in %d sub-album'] = 'en %d sub-categoría';
+$lang['in %d sub-albums'] = 'en %d sub-categorías';
 $lang['included'] = 'incluídos';
 $lang['Invalid password!'] = 'Contraseña incorrecta!';
 $lang['Language'] = 'Idioma';
@@ -211,7 +211,7 @@ $lang['Maximum height must be a number superior to 50'] = 'La altura de las imá
 $lang['Maximum width of the pictures'] = 'Ancho máximo de las imágenes';
 $lang['Maximum width must be a number superior to 50'] = 'El ancho de las imágenes debe ser superior a 50';
 $lang['display a calendar by creation date'] = 'mostrar un calendario por fecha de creación';
-$lang['display all elements in all sub-categories'] = 'mostrar de plano los elementos de categorías y sub-categorías';
+$lang['display all elements in all sub-albums'] = 'mostrar de plano los elementos de categorías y sub-categorías';
 $lang['return to normal view mode'] = 'volver a la apariencia inicial';
 $lang['display a calendar by posted date'] = 'mostrar un calendario por fecha de agregado';
 $lang['month'][10] = 'Octubre';
@@ -249,8 +249,8 @@ $lang['Preferences'] = 'Preferencias';
 $lang['Previous'] = 'Página anterior';
 $lang['Random pictures'] = 'Imágenes al azar';
 $lang['display a set of random pictures'] = 'mostrar un conjunto aleatorio de imágenes';
-$lang['Recent categories'] = 'Categorías recientes';
-$lang['display recently updated categories'] = 'mostrar las categorías creadas o actualizadas recientemente';
+$lang['Recent albums'] = 'Categorías recientes';
+$lang['display recently updated albums'] = 'mostrar las categorías creadas o actualizadas recientemente';
 $lang['Recent period'] = 'Período reciente';
 $lang['Recent pictures'] = 'Imágenes recientes';
 $lang['display most recent pictures'] = 'mostrar las imágenes más recientes';
@@ -266,7 +266,7 @@ $lang['remove this tag from the list'] = 'borrar este tag de la lista';
 $lang['representative'] = 'Representante';
 $lang['return to homepage'] = 'volver a la página de inicio';
 $lang['Search for Author'] = 'Buscar un autor';
-$lang['Search in Categories'] = 'Buscar en las categorías';
+$lang['Search in albums'] = 'Buscar en las categorías';
 $lang['Search by Date'] = 'Buscar por fecha';
 $lang['Date'] = 'Fecha';
 $lang['End-Date'] = 'Fecha fin';
@@ -277,10 +277,10 @@ $lang['Search for any terms'] = 'Buscar una de las palabras';
 $lang['Empty query. No criteria has been entered.'] = 'Búsqueda vacía: no ha sido indicado ningún criterio.';
 $lang['Search Options'] = 'Opciones de búsqueda';
 $lang['Search results'] = 'Resultados de la búsqueda';
-$lang['Search in subcategories'] = 'Buscar en sub-categorías';
+$lang['Search in sub-albums'] = 'Buscar en sub-categorías';
 $lang['searched words : %s'] = 'palabras buscadas : %s';
 $lang['Contact'] = 'Contacto';
-$lang['set as category representative'] = 'Elegir como representante de esta categoría';
+$lang['set as album representative'] = 'Elegir como representante de esta categoría';
 $lang['Show number of comments'] = 'Mostrar la cantidad de comentarios';
 $lang['Show number of hits'] = 'Mostrar la cantidad de visualizaciones';
 $lang['slideshow'] = 'Proyección';
@@ -322,7 +322,7 @@ $lang['User: %s'] = 'Usuario: %s';
 $lang['Email: %s'] = 'Correo electrónico: %s';
 $lang['Admin: %s'] = 'Administración: %s';
 $lang['Registration of %s'] = 'Registro de %s';
-$lang['Category: %s'] = 'Categoría: %s';
+$lang['Album: %s'] = 'Categoría: %s';
 $lang['Picture name: %s'] = 'Nombre de la imagen: %s';
 $lang['Creation date: %s'] = 'Fecha de creación: %d';
 $lang['Waiting page: %s'] = 'Página en espera: %s';
@@ -332,7 +332,7 @@ $lang['Bad status for user "guest", using default status. Please notify the webm
 // --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administradores, webmasters y usuarios especiales no pueden usar ese método';
 $lang['a user use already this mail address'] = 'ya existe un usuario con esa misma dirección de correo electrónico';
-$lang['Category results for'] = 'Resultados de categorías para';
+$lang['Album results for'] = 'Resultados de categorías para';
 $lang['Tag results for'] = 'Resultados de tags para';
 $lang['from %s to %s'] = 'del %s al %s';
 $lang['Play of slideshow'] = 'Lectura de la proyección';
diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php
index 260692eb8..420330760 100644
--- a/language/es_ES/admin.lang.php
+++ b/language/es_ES/admin.lang.php
@@ -23,14 +23,14 @@
 
 $lang['%d association'] = '%d asociación';
 $lang['%d associations'] = '%d asociaciones';
-$lang['%d category including'] = '%d categoría entre las cuales ';
-$lang['%d categories including'] = '%d categorías entre las cuates ';
+$lang['%d album including'] = '%d categoría entre las cuales ';
+$lang['%d albums including'] = '%d categorías entre las cuates ';
 $lang['%d physical'] = '%d físico';
 $lang['%d physical'] = '%d físicos';
 $lang[' and %d virtual'] = ' et %d virtual';
 $lang[' and %d virtual'] = ' et %d virtuales';
-$lang['%d category moved'] = '%d categoría trasladada';
-$lang['%d categories moved'] = '%d categorías trasladadas';
+$lang['%d album moved'] = '%d categoría trasladada';
+$lang['%d albums moved'] = '%d categorías trasladadas';
 $lang['%d group'] = '%d grupo';
 $lang['%d groups'] = '%d grupos';
 $lang['%d member'] = '%d miembro';
@@ -595,7 +595,7 @@ $lang['overrides existing values with empty ones'] = 'Reemplazar los valores exi
 $lang['manage image ranks'] = 'Administrar el orden de las imágenes';
 $lang['Manage image ranks'] = 'Administrar el orden de las imágenes';
 $lang['Edit ranks'] = 'Modificar el orden';
-$lang['No element in this category'] = 'Ningún elemento en esta categoría';
+$lang['No element in this album'] = 'Ningún elemento en esta categoría';
 $lang['Images manual order was saved'] = 'La orden manual de las imágenes ha sido salvada';
 $lang['ranks'] = 'Filas';
 $lang['Drag to re-order'] = 'Hacer clic deslizar para reorganizar';
diff --git a/language/es_ES/common.lang.php b/language/es_ES/common.lang.php
index e9893ceac..5f67a4456 100644
--- a/language/es_ES/common.lang.php
+++ b/language/es_ES/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['zero_plural'] = false;
 
 $lang['%.2f (rated %d times)'] = '%.2f (noté %d fois)';
 $lang['%d Kb'] = '%d Ko';
-$lang['%d category updated'] = '%d Categoría actualizada';
-$lang['%d categories updated'] = '%d Actualización categorías';
+$lang['%d album updated'] = '%d Categoría actualizada';
+$lang['%d albums updated'] = '%d Actualización categorías';
 $lang['%d comment to validate'] = '%d Comentario usuario que hay que validar';
 $lang['%d comments to validate'] = '%d comentarios de usuario que hay que validar';
 $lang['%d new comment'] = '%d Nuevo comentario usuario';
@@ -117,7 +117,7 @@ $lang['Sort by'] = 'Clasificar según';
 $lang['Sort order'] = 'Orden de Clasificación';
 $lang['Tag'] = 'Etiqueta';
 $lang['Tags'] = 'Etiquetas';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'Mediante RSS puede recibir notificación de los cambios que tienen lugar en la galería: nuevas imágenes, categorías, etc. Para registrarse, haga clic en uno de los siguientes enlaces.';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'Mediante RSS puede recibir notificación de los cambios que tienen lugar en la galería: nuevas imágenes, categorías, etc. Para registrarse, haga clic en uno de los siguientes enlaces.';
 $lang['Unknown feed identifier'] = 'Identificador de RSS desconocido';
 $lang['User comments'] = 'Comentarios del usuario';
 $lang['Username'] = 'Nombre del usuario';
@@ -133,7 +133,7 @@ $lang['Adviser mode enabled'] = 'Modo de consejero activo';
 $lang['all'] = 'todo';
 $lang['ascending'] = 'ascendiente';
 $lang['author(s) : %s'] = 'autor(es) : %s';
-$lang['Expand all categories'] = 'Expandir todas las categorías';
+$lang['Expand all albums'] = 'Expandir todas las categorías';
 $lang['posted after %s (%s)'] = 'disponible con posterioridad al %s (%s)';
 $lang['posted before %s (%s)'] = 'disponible antes del %s (%s)';
 $lang['posted between %s (%s) and %s (%s)'] = 'disponible entre él %s (%s) y el %s (%s)';
@@ -189,15 +189,15 @@ $lang['Page generated in'] = 'Página generada en';
 $lang['guest'] = 'Visitante';
 $lang['Hello'] = 'Hola';
 $lang['available for administrators only'] = 'disponible sólo para los administradores';
-$lang['shows images at the root of this category'] = 'muestra las imágenes  en el directorio raíz de esta categoría';
+$lang['shows images at the root of this album'] = 'muestra las imágenes  en el directorio raíz de esta categoría';
 $lang['See last users comments'] = 'Ver los últimos comentarios de los usuarios';
 $lang['customize the appareance of the gallery'] = 'personalizar el aspecto de la galería';
 $lang['search'] = 'Buscar';
 $lang['Home'] = 'Inicio';
 $lang['Identification'] = 'Identificación';
-$lang['in this category'] = 'en esta categoría';
-$lang['in %d sub-category'] = 'en %d subcategoría';
-$lang['in %d sub-categories'] = 'en %d subcategorías';
+$lang['in this album'] = 'en esta categoría';
+$lang['in %d sub-album'] = 'en %d subcategoría';
+$lang['in %d sub-albums'] = 'en %d subcategorías';
 $lang['included'] = 'incluidos';
 $lang['Invalid password!'] = 'Contraseña incorrecta !';
 $lang['Language'] = 'Idioma';
@@ -211,7 +211,7 @@ $lang['Maximum height must be a number superior to 50'] = 'La altura máxima de
 $lang['Maximum width of the pictures'] = 'Anchura máxima de las imágenes';
 $lang['Maximum width must be a number superior to 50'] = 'El ancho máximo de las imágenes no debe ser superior a 50';
 $lang['display a calendar by creation date'] = 'Mostrar las imágenes en un calendario por fecha de creación';
-$lang['display all elements in all sub-categories'] = 'Mostrar todos los elementos de todas las categorías';
+$lang['display all elements in all sub-albums'] = 'Mostrar todos los elementos de todas las categorías';
 $lang['return to normal view mode'] = 'Volver a la vista normal';
 $lang['display a calendar by posted date'] = 'Mostrar las imágenes en un calendario por fecha de agregación';
 $lang['month'][10] = 'Octubre';
@@ -249,8 +249,8 @@ $lang['Preferences'] = 'Preferencias';
 $lang['Previous'] = 'Página anterior';
 $lang['Random pictures'] = 'Selección aleatoria';
 $lang['display a set of random pictures'] = 'mostrar un grupo aleatorio de imágenes';
-$lang['Recent categories'] = 'Últimas categorías';
-$lang['display recently updated categories'] = 'mostrar las categorías recientement actualizadas o creadas';
+$lang['Recent albums'] = 'Últimas categorías';
+$lang['display recently updated albums'] = 'mostrar las categorías recientement actualizadas o creadas';
 $lang['Recent period'] = 'Número de imágenes recientes';
 $lang['Recent pictures'] = 'Últimas imágenes añadidas';
 $lang['display most recent pictures'] = 'Mostrar las imágenes añadidas recientemente';
@@ -266,7 +266,7 @@ $lang['remove this tag from the list'] = 'quitar este tag de la lista';
 $lang['representative'] = 'representante';
 $lang['return to homepage'] = 'Volver a la página de inicio';
 $lang['Search for Author'] = 'Buscar por autor';
-$lang['Search in Categories'] = 'Buscar por categorías';
+$lang['Search in albums'] = 'Buscar por categorías';
 $lang['Search by Date'] = 'Buscar por fecha';
 $lang['Date'] = 'Fecha';
 $lang['End-Date'] = 'Hasta la fecha';
@@ -277,10 +277,10 @@ $lang['Search for any terms'] = 'Buscar una de las palabras';
 $lang['Empty query. No criteria has been entered.'] = 'Demanda vacía. Ningún criterio surtido..';
 $lang['Search Options'] = 'Opciones de búsqueda';
 $lang['Search results'] = 'Resultados de la búsqueda';
-$lang['Search in subcategories'] = 'Buscar en las subcategorías';
+$lang['Search in sub-albums'] = 'Buscar en las subcategorías';
 $lang['searched words : %s'] = 'Palabras de búsqueda : %s';
 $lang['Contact'] = 'Contactar';
-$lang['set as category representative'] = 'elegir para representar esta categoría';
+$lang['set as album representative'] = 'elegir para representar esta categoría';
 $lang['Show number of comments'] = 'Mostrar el número de comentarios';
 $lang['Show number of hits'] = 'Mostrar el número de visualizaciones';
 $lang['slideshow'] = 'Diaporama';
@@ -322,7 +322,7 @@ $lang['User: %s'] = 'Usuario: %s';
 $lang['Email: %s'] = 'Email: %s';
 $lang['Admin: %s'] = 'Administración: %s';
 $lang['Registration of %s'] = 'Registro de %s';
-$lang['Category: %s'] = 'Categoría: %s';
+$lang['Album: %s'] = 'Categoría: %s';
 $lang['Picture name: %s'] = 'Nombre de la imagen: %s';
 $lang['Creation date: %s'] = 'Fecha de creación: %d';
 $lang['Waiting page: %s'] = 'Página de espera: %s';
@@ -332,7 +332,7 @@ $lang['Bad status for user "guest", using default status. Please notify the webm
 // --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'El Administrador, el administrador del sitio y el usuario especial no pueden utilizar este método';
 $lang['a user use already this mail address'] = 'Otro usuario ya utiliza esta dirección e-mail';
-$lang['Category results for'] = 'Resultados de las categorías para';
+$lang['Album results for'] = 'Resultados de las categorías para';
 $lang['Tag results for'] = 'Resultados de las etiquetas para';
 $lang['from %s to %s'] = 'de %s a %s';
 $lang['Play of slideshow'] = 'Lectura del diaporama';
diff --git a/language/fr_CA/admin.lang.php b/language/fr_CA/admin.lang.php
index 230f44055..6d1b5293d 100644
--- a/language/fr_CA/admin.lang.php
+++ b/language/fr_CA/admin.lang.php
@@ -25,14 +25,14 @@
 
 $lang['%d association'] = "%d association";
 $lang['%d associations'] = "%d associations";
-$lang['%d category including'] = "%d catégorie dont";
-$lang['%d categories including'] = "%d catégories dont";
+$lang['%d album including'] = "%d catégorie dont";
+$lang['%d albums including'] = "%d catégories dont";
 $lang['%d physical'] = " %d physique";
 $lang['%d physical'] = " %d physiques";
 $lang[' and %d virtual'] = " et %d virtuelle";
 $lang[' and %d virtual'] = " et %d virtuelles";
-$lang['%d category moved'] = "%d catégorie déplacée";
-$lang['%d categories moved'] = "%d catégories déplacées";
+$lang['%d album moved'] = "%d catégorie déplacée";
+$lang['%d albums moved'] = "%d catégories déplacées";
 $lang['%d group'] = "%d groupe";
 $lang['%d groups'] = "%d groupes";
 $lang['%d member'] = "%d membre";
@@ -609,7 +609,7 @@ $lang['overrides existing values with empty ones'] = "Écraser les données exis
 $lang['manage image ranks'] = "gérer l'ordre des images";
 $lang['Manage image ranks'] = "Gérer l'ordre des images";
 $lang['Edit ranks'] = "Modifier l'ordre";
-$lang['No element in this category'] = "Aucun élément dans cette catégorie";
+$lang['No element in this album'] = "Aucun élément dans cette catégorie";
 $lang['Images manual order was saved'] = "L'ordre manuel des images a été sauvegardé";
 $lang['ranks'] = "rangs";
 $lang['By rank'] = "Par le rang";
diff --git a/language/fr_CA/common.lang.php b/language/fr_CA/common.lang.php
index 41c17e473..b4d10d3d8 100644
--- a/language/fr_CA/common.lang.php
+++ b/language/fr_CA/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['zero_plural'] = false;
 
 $lang['%.2f (rated %d times)'] = '%.2f (notée %d fois)';
 $lang['%d Kb'] = '%d Ko';
-$lang['%d category updated'] = '%d catégorie mise à jour';
-$lang['%d categories updated'] = '%d catégories mises à jour';
+$lang['%d album updated'] = '%d catégorie mise à jour';
+$lang['%d albums updated'] = '%d catégories mises à jour';
 $lang['%d comment to validate'] = '%d commentaire utilisateur à valider';
 $lang['%d comments to validate'] = '%d commentaires utilisateurs à valider';
 $lang['%d new comment'] = '%d nouveau commentaire utilisateur';
@@ -116,7 +116,7 @@ $lang['Sort by'] = 'Trier selon';
 $lang['Sort order'] = 'Ordre de tri';
 $lang['Tag'] = 'Mot clé';
 $lang['Tags'] = 'Mots clés';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'Le flux RSS notifie les événements de la galerie : nouvelles images, catégories mises à jour, nouveaux commentaires utilisateurs. À utiliser avec un lecteur de flux RSS.';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'Le flux RSS notifie les événements de la galerie : nouvelles images, catégories mises à jour, nouveaux commentaires utilisateurs. À utiliser avec un lecteur de flux RSS.';
 $lang['Unknown feed identifier'] = 'Identifiant de flux inconnu';
 $lang['User comments'] = 'Commentaires utilisateur';
 $lang['Username'] = 'Nom d\'utilisateur';
@@ -132,7 +132,7 @@ $lang['Adviser mode enabled'] = 'Mode conseiller actif';
 $lang['all'] = 'tout';
 $lang['ascending'] = 'croissant';
 $lang['author(s) : %s'] = 'auteur(s) : %s';
-$lang['Expand all categories'] = 'Développer toutes les catégories';
+$lang['Expand all albums'] = 'Développer toutes les catégories';
 $lang['posted after %s (%s)'] = 'mis en ligne après le %s (%s)';
 $lang['posted before %s (%s)'] = 'mis en ligne avant le %s (%s)';
 $lang['posted between %s (%s) and %s (%s)'] = 'mis en ligne entre le %s (%s) et le %s (%s)';
@@ -188,15 +188,15 @@ $lang['Page generated in'] = 'Page fabriquée en';
 $lang['guest'] = 'visiteur';
 $lang['Hello'] = 'Bonjour';
 $lang['available for administrators only'] = 'disponible uniquement pour les administrateurs';
-$lang['shows images at the root of this category'] = 'montre les images à la racine de cette catégorie';
+$lang['shows images at the root of this album'] = 'montre les images à la racine de cette catégorie';
 $lang['See last users comments'] = 'Voir les derniers commentaires utilisateurs';
 $lang['customize the appareance of the gallery'] = 'personnaliser l\'apparence de la galerie';
 $lang['search'] = 'recherche';
 $lang['Home'] = 'Accueil';
 $lang['Identification'] = 'Identification';
-$lang['in this category'] = 'dans cette catégorie';
-$lang['in %d sub-category'] = 'dans %d sous-catégorie';
-$lang['in %d sub-categories'] = 'dans %d sous-catégories';
+$lang['in this album'] = 'dans cette catégorie';
+$lang['in %d sub-album'] = 'dans %d sous-catégorie';
+$lang['in %d sub-albums'] = 'dans %d sous-catégories';
 $lang['included'] = 'inclus';
 $lang['Invalid password!'] = 'Mot de passe invalide !';
 $lang['Language'] = 'Langue';
@@ -210,7 +210,7 @@ $lang['Maximum height must be a number superior to 50'] = 'La hauteur maximum de
 $lang['Maximum width of the pictures'] = 'Largeur maximum des images';
 $lang['Maximum width must be a number superior to 50'] = 'La largeur des images doit être supérieure à 50';
 $lang['display a calendar by creation date'] = 'afficher un calendrier par date de création';
-$lang['display all elements in all sub-categories'] = 'afficher à plat les éléments des catégories et des sous-catégories';
+$lang['display all elements in all sub-albums'] = 'afficher à plat les éléments des catégories et des sous-catégories';
 $lang['return to normal view mode'] = 'retourner à la vue normale';
 $lang['display a calendar by posted date'] = 'afficher un calendrier par date d\'ajout';
 $lang['month'][10] = 'Octobre';
@@ -249,8 +249,8 @@ $lang['Preferences'] = 'Préférences';
 $lang['Previous'] = 'Précédente';
 $lang['Random pictures'] = 'Images au hasard';
 $lang['display a set of random pictures'] = 'afficher un ensemble d\'images prises au hasard';
-$lang['Recent categories'] = 'Catégories récentes';
-$lang['display recently updated categories'] = 'afficher les catégories récemment mises à jour ou créées';
+$lang['Recent albums'] = 'Catégories récentes';
+$lang['display recently updated albums'] = 'afficher les catégories récemment mises à jour ou créées';
 $lang['Recent period'] = 'Période récente';
 $lang['Recent pictures'] = 'Images récentes';
 $lang['display most recent pictures'] = 'afficher les images les plus récentes';
@@ -266,7 +266,7 @@ $lang['remove this tag from the list'] = 'retirer ce mot clé de la liste';
 $lang['representative'] = 'représentante';
 $lang['return to homepage'] = 'retour à la page d\'accueil';
 $lang['Search for Author'] = 'Rechercher un auteur';
-$lang['Search in Categories'] = 'Rechercher dans les catégories';
+$lang['Search in albums'] = 'Rechercher dans les catégories';
 $lang['Search by Date'] = 'Recherche par date';
 $lang['Date'] = 'Date';
 $lang['End-Date'] = 'Date de fin';
@@ -277,11 +277,11 @@ $lang['Search for any terms'] = 'Rechercher un des mots';
 $lang['Empty query. No criteria has been entered.'] = 'Requête vide. Aucun critère saisi.';
 $lang['Search Options'] = 'Options de recherche';
 $lang['Search results'] = 'Résultats de recherche';
-$lang['Search in subcategories'] = 'Rechercher dans les sous-catégories';
+$lang['Search in sub-albums'] = 'Rechercher dans les sous-catégories';
 $lang['Search'] = 'Recherche';
 $lang['searched words : %s'] = 'mots recherchés : %s';
 $lang['Contact'] = 'Contacter';
-$lang['set as category representative'] = 'Choisir comme représentante de cette catégorie';
+$lang['set as album representative'] = 'Choisir comme représentante de cette catégorie';
 $lang['Show number of comments'] = 'Montrer le nombre de commentaires';
 $lang['Show number of hits'] = 'Montrer le nombre de visualisations';
 $lang['slideshow'] = 'diaporama';
@@ -324,7 +324,7 @@ $lang['User: %s'] = 'Utilisateur: %s';
 $lang['Email: %s'] = 'Courriel : %s';
 $lang['Admin: %s'] = 'Administration : %s';
 $lang['Registration of %s'] = 'Enregistrement de %s';
-$lang['Category: %s'] = 'Catégorie : %s';
+$lang['Album: %s'] = 'Catégorie : %s';
 $lang['Picture name: %s'] = 'Nom de l\'image : %s';
 $lang['Creation date: %s'] = 'Date de création : %d';
 $lang['Waiting page: %s'] = 'Page en attente : %s';
@@ -334,7 +334,7 @@ $lang['Bad status for user "guest", using default status. Please notify the webm
 // --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrateur, webmestre et utilisateur spécial ne peuvent pas utiliser cette méthode';
 $lang['a user use already this mail address'] = 'un autre utilisateur utilise déjà cette adresse de courriel';
-$lang['Category results for'] = 'Résultats des catégories pour';
+$lang['Album results for'] = 'Résultats des catégories pour';
 $lang['Tag results for'] = 'Résultats des mots clés pour';
 $lang['from %s to %s'] = 'du %s au %s';
 $lang['Play of slideshow'] = 'Lecture du diaporama';
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 3b4df1c3d..9f24e2071 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -25,14 +25,14 @@
 
 $lang['%d association'] = "%d association";
 $lang['%d associations'] = "%d associations";
-$lang['%d category including'] = "%d catégorie dont";
-$lang['%d categories including'] = "%d catégories dont";
+$lang['%d album including'] = "%d catégorie dont";
+$lang['%d albums including'] = "%d catégories dont";
 $lang['%d physical'] = " %d physique";
 $lang['%d physical'] = " %d physiques";
 $lang[' and %d virtual'] = " et %d virtuelle";
 $lang[' and %d virtual'] = " et %d virtuelles";
-$lang['%d category moved'] = "%d catégorie déplacée";
-$lang['%d categories moved'] = "%d catégories déplacées";
+$lang['%d album moved'] = "%d catégorie déplacée";
+$lang['%d albums moved'] = "%d catégories déplacées";
 $lang['%d group'] = "%d groupe";
 $lang['%d groups'] = "%d groupes";
 $lang['%d member'] = "%d membre";
@@ -599,7 +599,7 @@ $lang['overrides existing values with empty ones'] = "Ecraser les données exist
 $lang['manage image ranks'] = "gérer l'ordre des images";
 $lang['Manage image ranks'] = "Gérer l'ordre des images";
 $lang['Edit ranks'] = "Modifier l'ordre";
-$lang['No element in this category'] = "Aucun élément dans cette catégorie";
+$lang['No element in this album'] = "Aucun élément dans cette catégorie";
 $lang['Images manual order was saved'] = "L'ordre manuel des images a été sauvegardé";
 $lang['ranks'] = "rangs";
 $lang['By rank'] = "Par le rang";
diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php
index 0f654177d..c7c7f2858 100644
--- a/language/fr_FR/common.lang.php
+++ b/language/fr_FR/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['zero_plural'] = false;
 
 $lang['%.2f (rated %d times)'] = '%.2f (notée %d fois)';
 $lang['%d Kb'] = '%d Ko';
-$lang['%d category updated'] = '%d catégorie mise à jour';
-$lang['%d categories updated'] = '%d catégories mises à jour';
+$lang['%d album updated'] = '%d catégorie mise à jour';
+$lang['%d albums updated'] = '%d catégories mises à jour';
 $lang['%d comment to validate'] = '%d commentaire utilisateur à valider';
 $lang['%d comments to validate'] = '%d commentaires utilisateurs à valider';
 $lang['%d new comment'] = '%d nouveau commentaire utilisateur';
@@ -116,7 +116,7 @@ $lang['Sort by'] = 'Trier selon';
 $lang['Sort order'] = 'Ordre de tri';
 $lang['Tag'] = 'Tag';
 $lang['Tags'] = 'Tags';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'Le flux RSS notifie les événements de la galerie : nouvelles images, catégories mises à jour, nouveaux commentaires utilisateurs. À utiliser avec un lecteur de flux RSS.';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'Le flux RSS notifie les événements de la galerie : nouvelles images, catégories mises à jour, nouveaux commentaires utilisateurs. À utiliser avec un lecteur de flux RSS.';
 $lang['Unknown feed identifier'] = 'Identifiant de flux inconnu';
 $lang['User comments'] = 'Commentaires utilisateur';
 $lang['Username'] = 'Nom d\'utilisateur';
@@ -132,7 +132,7 @@ $lang['Adviser mode enabled'] = 'Mode conseiller actif';
 $lang['all'] = 'tout';
 $lang['ascending'] = 'croissant';
 $lang['author(s) : %s'] = 'auteur(s) : %s';
-$lang['Expand all categories'] = 'Développer toutes les catégories';
+$lang['Expand all albums'] = 'Développer toutes les catégories';
 $lang['posted after %s (%s)'] = 'mis en ligne après le %s (%s)';
 $lang['posted before %s (%s)'] = 'mis en ligne avant le %s (%s)';
 $lang['posted between %s (%s) and %s (%s)'] = 'mis en ligne entre le %s (%s) et le %s (%s)';
@@ -188,15 +188,15 @@ $lang['Page generated in'] = 'Page fabriquée en';
 $lang['guest'] = 'visiteur';
 $lang['Hello'] = 'Bonjour';
 $lang['available for administrators only'] = 'disponible uniquement pour les administrateurs';
-$lang['shows images at the root of this category'] = 'montre les images à la racine de cette catégorie';
+$lang['shows images at the root of this album'] = 'montre les images à la racine de cette catégorie';
 $lang['See last users comments'] = 'Voir les derniers commentaires utilisateurs';
 $lang['customize the appareance of the gallery'] = 'personnaliser l\'apparence de la galerie';
 $lang['search'] = 'recherche';
 $lang['Home'] = 'Accueil';
 $lang['Identification'] = 'Identification';
-$lang['in this category'] = 'dans cette catégorie';
-$lang['in %d sub-category'] = 'dans %d sous-catégorie';
-$lang['in %d sub-categories'] = 'dans %d sous-catégories';
+$lang['in this album'] = 'dans cette catégorie';
+$lang['in %d sub-album'] = 'dans %d sous-catégorie';
+$lang['in %d sub-albums'] = 'dans %d sous-catégories';
 $lang['included'] = 'inclus';
 $lang['Invalid password!'] = 'Mot de passe invalide !';
 $lang['Language'] = 'Langue';
@@ -210,7 +210,7 @@ $lang['Maximum height must be a number superior to 50'] = 'La hauteur maximum de
 $lang['Maximum width of the pictures'] = 'Largeur maximum des images';
 $lang['Maximum width must be a number superior to 50'] = 'La largeur des images doit être supérieure à 50';
 $lang['display a calendar by creation date'] = 'afficher un calendrier par date de création';
-$lang['display all elements in all sub-categories'] = 'afficher à plat les éléments des catégories et des sous-catégories';
+$lang['display all elements in all sub-albums'] = 'afficher à plat les éléments des catégories et des sous-catégories';
 $lang['return to normal view mode'] = 'retourner à la vue normale';
 $lang['display a calendar by posted date'] = 'afficher un calendrier par date d\'ajout';
 $lang['month'][10] = 'Octobre';
@@ -248,8 +248,8 @@ $lang['Preferences'] = 'Préférences';
 $lang['Previous'] = 'Précédente';
 $lang['Random pictures'] = 'Images au hasard';
 $lang['display a set of random pictures'] = 'afficher un ensemble d\'images prises au hasard';
-$lang['Recent categories'] = 'Catégories récentes';
-$lang['display recently updated categories'] = 'afficher les catégories récemment mises à jour ou créées';
+$lang['Recent albums'] = 'Catégories récentes';
+$lang['display recently updated albums'] = 'afficher les catégories récemment mises à jour ou créées';
 $lang['Recent period'] = 'Période récente';
 $lang['Recent pictures'] = 'Images récentes';
 $lang['display most recent pictures'] = 'afficher les images les plus récentes';
@@ -265,7 +265,7 @@ $lang['remove this tag from the list'] = 'retirer ce tag de la liste';
 $lang['representative'] = 'représentante';
 $lang['return to homepage'] = 'retour à la page d\'accueil';
 $lang['Search for Author'] = 'Rechercher un auteur';
-$lang['Search in Categories'] = 'Rechercher dans les catégories';
+$lang['Search in albums'] = 'Rechercher dans les catégories';
 $lang['Search by Date'] = 'Recherche par date';
 $lang['Date'] = 'Date';
 $lang['End-Date'] = 'Date de fin';
@@ -276,10 +276,10 @@ $lang['Search for any terms'] = 'Rechercher un des mots';
 $lang['Empty query. No criteria has been entered.'] = 'Requête vide. Aucun critère saisi.';
 $lang['Search Options'] = 'Options de recherche';
 $lang['Search results'] = 'Résultats de recherche';
-$lang['Search in subcategories'] = 'Rechercher dans les sous-catégories';
+$lang['Search in sub-albums'] = 'Rechercher dans les sous-catégories';
 $lang['searched words : %s'] = 'mots recherchés : %s';
 $lang['Contact'] = 'Contacter';
-$lang['set as category representative'] = 'Choisir comme représentante de cette catégorie';
+$lang['set as album representative'] = 'Choisir comme représentante de cette catégorie';
 $lang['Show number of comments'] = 'Montrer le nombre de commentaires';
 $lang['Show number of hits'] = 'Montrer le nombre de visualisations';
 $lang['slideshow'] = 'diaporama';
@@ -321,7 +321,7 @@ $lang['User: %s'] = 'Utilisateur: %s';
 $lang['Email: %s'] = 'Email : %s';
 $lang['Admin: %s'] = 'Administration : %s';
 $lang['Registration of %s'] = 'Enregistrement de %s';
-$lang['Category: %s'] = 'Catégorie : %s';
+$lang['Album: %s'] = 'Catégorie : %s';
 $lang['Picture name: %s'] = 'Nom de l\'image : %s';
 $lang['Creation date: %s'] = 'Date de création : %d';
 $lang['Waiting page: %s'] = 'Page en attente : %s';
@@ -331,7 +331,7 @@ $lang['Bad status for user "guest", using default status. Please notify the webm
 // --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrateur, webmestre et utilisateur spécial ne peuvent pas utiliser cette méthode';
 $lang['a user use already this mail address'] = 'un autre utilisateur utilise déjà cette adresse e-mail';
-$lang['Category results for'] = 'Résultats des catégories pour';
+$lang['Album results for'] = 'Résultats des catégories pour';
 $lang['Tag results for'] = 'Résultats des tags pour';
 $lang['from %s to %s'] = 'du %s au %s';
 $lang['Play of slideshow'] = 'Lecture du diaporama';
diff --git a/language/hr_HR/admin.lang.php b/language/hr_HR/admin.lang.php
index a04806b4c..f351d513c 100644
--- a/language/hr_HR/admin.lang.php
+++ b/language/hr_HR/admin.lang.php
@@ -23,14 +23,14 @@
 
 $lang['%d association'] = '%d poveznica';
 $lang['%d associations'] = '%d poveznica';
-$lang['%d category including'] = '%d skupina obuhvata ';
-$lang['%d categories including'] = '%d skupine obuhvata ';
+$lang['%d album including'] = '%d skupina obuhvata ';
+$lang['%d albums including'] = '%d skupine obuhvata ';
 $lang['%d physical'] = '%d stvarna';
 $lang['%d physical'] = '%d stvarnih';
 $lang[' and %d virtual'] = ' i %d nestvrana';
 $lang[' and %d virtual'] = ' i %d nestvarnih';
-$lang['%d category moved'] = '%d skupina premještena';
-$lang['%d categories moved'] = '%d skupina premješteno';
+$lang['%d album moved'] = '%d skupina premještena';
+$lang['%d albums moved'] = '%d skupina premješteno';
 $lang['%d group'] = '%d grupa';
 $lang['%d groups'] = '%d grupa';
 $lang['%d member'] = '%d član';
@@ -593,7 +593,7 @@ $lang['overrides existing values with empty ones'] = 'prekucava postojeće vrije
 $lang['manage image ranks'] = 'upravljanje poretkom slika';
 $lang['Manage image ranks'] = 'Uprava poretkom';
 $lang['Edit ranks'] = 'Uredi poredak';
-$lang['No element in this category'] = 'Nema stavke u ovoj skupini';
+$lang['No element in this album'] = 'Nema stavke u ovoj skupini';
 $lang['Images manual order was saved'] = 'Pohranjen je izvorni redoslijed slika';
 $lang['ranks'] = 'poretci';
 $lang['Drag to re-order'] = 'Povuci za preslagivanje';
diff --git a/language/hr_HR/common.lang.php b/language/hr_HR/common.lang.php
index 099ff8671..edaaba6b9 100644
--- a/language/hr_HR/common.lang.php
+++ b/language/hr_HR/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['zero_plural'] = true;
 
 $lang['%.2f (rated %d times)'] = '%.2f (ocijenjeno %d puta)';
 $lang['%d Kb'] = '%d Kb';
-$lang['%d category updated'] = '%d skupina obnovljena';
-$lang['%d categories updated'] = '%d skupine obnovljene';
+$lang['%d album updated'] = '%d skupina obnovljena';
+$lang['%d albums updated'] = '%d skupine obnovljene';
 $lang['%d comment to validate'] = '%d komentar za ovjeru';
 $lang['%d comments to validate'] = '%d komentari za ovjeru';
 $lang['%d new comment'] = '%d novi komentar';
@@ -117,7 +117,7 @@ $lang['Sort by'] = 'Složeno po';
 $lang['Sort order'] = 'Redoslijed slaganja';
 $lang['Tag'] = 'Tag';
 $lang['Tags'] = 'Tagovi';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'RSS obavijesni izvor omogućava obavještavanje o novostima sa ovog web mjesta : nove slike, obnovljene skupine, nove komentare. Koristite čitač RSS izvora.';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'RSS obavijesni izvor omogućava obavještavanje o novostima sa ovog web mjesta : nove slike, obnovljene skupine, nove komentare. Koristite čitač RSS izvora.';
 $lang['Unknown feed identifier'] = 'Nepoznata oznaka izvora';
 $lang['User comments'] = 'Korisnički komentari';
 $lang['Username'] = 'Korisničko ime';
@@ -133,7 +133,7 @@ $lang['Adviser mode enabled'] = 'Savjetnički modul omogućen';
 $lang['all'] = 'sve';
 $lang['ascending'] = 'uzlazno';
 $lang['author(s) : %s'] = 'autor(i) : %s';
-$lang['Expand all categories'] = 'Proširi sve skupine';
+$lang['Expand all albums'] = 'Proširi sve skupine';
 $lang['posted after %s (%s)'] = 'objavljeno nakon %s (%s)';
 $lang['posted before %s (%s)'] = 'objavljeno prije %s (%s)';
 $lang['posted between %s (%s) and %s (%s)'] = 'objavljeno između %s (%s) i %s (%s)';
@@ -189,15 +189,15 @@ $lang['Page generated in'] = 'Stranica izrađena u ';
 $lang['guest'] = 'gost';
 $lang['Hello'] = 'Pozdrav';
 $lang['available for administrators only'] = 'dostupno samo upraviteljima';
-$lang['shows images at the root of this category'] = 'prikazuje slike u korijenu skupine';
+$lang['shows images at the root of this album'] = 'prikazuje slike u korijenu skupine';
 $lang['See last users comments'] = 'Pregled zadnjih korisničkih komentara';
 $lang['customize the appareance of the gallery'] = 'prilagodite izgled vaše galerije';
 $lang['search'] = 'pretraži';
 $lang['Home'] = 'Naslovnica';
 $lang['Identification'] = 'Prijavnica';
-$lang['in this category'] = 'u ovoj skupini';
-$lang['in %d sub-category'] = 'u %d podskupini';
-$lang['in %d sub-categories'] = 'u %d podskupinama';
+$lang['in this album'] = 'u ovoj skupini';
+$lang['in %d sub-album'] = 'u %d podskupini';
+$lang['in %d sub-albums'] = 'u %d podskupinama';
 $lang['included'] = 'uključeno';
 $lang['Invalid password!'] = 'Nevaljana zaporka!';
 $lang['Language']='Jezik';
@@ -211,7 +211,7 @@ $lang['Maximum height must be a number superior to 50'] = 'Najveća visina mora
 $lang['Maximum width of the pictures'] = 'Najveća dozvoljena širina slika';
 $lang['Maximum width must be a number superior to 50'] = 'Najveća širina mora biti broj veći od 50';
 $lang['display a calendar by creation date'] = 'prikaz kalendara po nadnevku izrade';
-$lang['display all elements in all sub-categories'] = 'prikaz svih stavki u svim podskupinama';
+$lang['display all elements in all sub-albums'] = 'prikaz svih stavki u svim podskupinama';
 $lang['return to normal view mode'] = 'povratak u uobičajeni način pregleda';
 $lang['display a calendar by posted date'] = 'prikaz kalendara po nadnevku objave';
 $lang['month'][10] = 'Listopad';
@@ -249,8 +249,8 @@ $lang['Preferences'] = 'Postavke';
 $lang['Previous'] = 'Prethodni';
 $lang['Random pictures'] = 'Slike slučajnog odabira';
 $lang['display a set of random pictures'] = 'prikaz slika slučajnim odabirom';
-$lang['Recent categories'] = 'Nedavne skupine';
-$lang['display recently updated categories'] = 'prikaz nedavno obnovljenih skupina';
+$lang['Recent albums'] = 'Nedavne skupine';
+$lang['display recently updated albums'] = 'prikaz nedavno obnovljenih skupina';
 $lang['Recent period'] = 'Nedavno razdoblje';
 $lang['Recent pictures'] = 'Nedavne slike';
 $lang['display most recent pictures'] = 'prikaz najnovijih slika';
@@ -266,7 +266,7 @@ $lang['remove this tag from the list'] = 'ukloni  ovaj tag iz popisa';
 $lang['representative'] = 'predstavnik';
 $lang['return to homepage'] = 'povratak na naslovnicu';
 $lang['Search for Author'] = 'Pretraživanje po Autoru';
-$lang['Search in Categories'] = 'Pretraživanje u Skupinama';
+$lang['Search in albums'] = 'Pretraživanje u Skupinama';
 $lang['Search by Date'] = 'Pretraživanje po Nadnevku';
 $lang['Date'] = 'Nadnevak';
 $lang['End-Date'] = 'Krajnji Nadnevak';
@@ -277,10 +277,10 @@ $lang['Search for any terms'] = 'Pretraživanje po bilo kojem uvjetu';
 $lang['Empty query. No criteria has been entered.'] = 'Prazni upit. Nije uneseno ni jedno obilježje.';
 $lang['Search Options'] = 'Mogućnosti Pretraživanja';
 $lang['Search results'] = 'Ishodi pretraživanja';
-$lang['Search in subcategories'] = 'Pretraga u podskupinama';
+$lang['Search in sub-albums'] = 'Pretraga u podskupinama';
 $lang['searched words : %s'] = 'tražene riječi : %s';
 $lang['Contact'] = 'Kontakt';
-$lang['set as category representative'] = 'postavi za predstavnika skupine';
+$lang['set as album representative'] = 'postavi za predstavnika skupine';
 $lang['Show number of comments'] = 'Prikaži broj komentara';
 $lang['Show number of hits'] = 'Prikaži broj posjeta';
 $lang['slideshow'] = 'klizni prikaz';
@@ -322,7 +322,7 @@ $lang['User: %s'] = 'Korisnik: %s';
 $lang['Email: %s'] = 'E-mail: %s';
 $lang['Admin: %s'] = 'Upravitelj: %s';
 $lang['Registration of %s'] = 'Upis od %s';
-$lang['Category: %s'] = 'Skupina: %s';
+$lang['Album: %s'] = 'Skupina: %s';
 $lang['Picture name: %s'] = 'Naziv slike: %s';
 $lang['Creation date: %s'] = 'Nadnevak izrade: %s';
 $lang['Waiting page: %s'] = 'Stranica počeka: %s';
@@ -332,7 +332,7 @@ $lang['Bad status for user "guest", using default status. Please notify the webm
 // --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Upravitelj, webmaster i posebni korisnik ne mogu koristiti ovu metodu';
 $lang['a user use already this mail address'] = 'korisnik već koristi ovu e-mail adresu';
-$lang['Category results for'] = 'Ishodi skupine za ';
+$lang['Album results for'] = 'Ishodi skupine za ';
 $lang['Tag results for'] = 'Ishodi tagova za';
 $lang['from %s to %s'] = 'od %s do %s';
 $lang['Play of slideshow'] = 'Pokreni klizni prikaz';
diff --git a/language/hu_HU/admin.lang.php b/language/hu_HU/admin.lang.php
index fb9836d1f..9670eab73 100644
--- a/language/hu_HU/admin.lang.php
+++ b/language/hu_HU/admin.lang.php
@@ -23,14 +23,14 @@
 
 $lang['%d association'] = '%d hozzárendelés (fizikai és virtuális)';
 $lang['%d associations'] = '%d hozzárendelés (fizikai és virtuális)';
-$lang['%d category including'] = '%d kategória ';
-$lang['%d categories including'] = '%d kategória ';
+$lang['%d album including'] = '%d kategória ';
+$lang['%d albums including'] = '%d kategória ';
 $lang['%d physical'] = '%d fizikai';
 $lang['%d physical'] = '%d fizikai';
 $lang[' and %d virtual'] = ' és %d virtuális';
 $lang[' and %d virtual'] = ' és %d virtuális';
-$lang['%d category moved'] = '%d Kategória áthelyezése';
-$lang['%d categories moved'] = '%d Kategória áthelyezése';
+$lang['%d album moved'] = '%d Kategória áthelyezése';
+$lang['%d albums moved'] = '%d Kategória áthelyezése';
 $lang['%d group'] = '%d csoport';
 $lang['%d groups'] = '%d csoport';
 $lang['%d member'] = '%d tag';
@@ -595,7 +595,7 @@ $lang['overrides existing values with empty ones'] = 'Felülírja a meglévő ü
 $lang['manage image ranks'] = 'Kép rangok kezelése';
 $lang['Manage image ranks'] = 'Kép rangok kezelése';
 $lang['Edit ranks'] = 'Rangok módosítása';
-$lang['No element in this category'] = 'Nincs elem ebben a kategóriában';
+$lang['No element in this album'] = 'Nincs elem ebben a kategóriában';
 $lang['Images manual order was saved'] = 'Kép információk mentve';
 $lang['ranks'] = 'Rangok';
 $lang['Drag to re-order'] = 'Húzással átrendezheti';
diff --git a/language/hu_HU/common.lang.php b/language/hu_HU/common.lang.php
index bb63132d9..7c588a571 100644
--- a/language/hu_HU/common.lang.php
+++ b/language/hu_HU/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['zero_plural'] = false;
 
 $lang['%.2f (rated %d times)'] = '%.2f (értékelve %d alkalommal)';
 $lang['%d Kb'] = '%d Kbájt';
-$lang['%d category updated'] = '%d kategória frissítés';
-$lang['%d categories updated'] = '%d kategória frissítve';
+$lang['%d album updated'] = '%d kategória frissítés';
+$lang['%d albums updated'] = '%d kategória frissítve';
 $lang['%d comment to validate'] = '%d hozzászólás engedélyezve';
 $lang['%d comments to validate'] = '%d hozzászólás vár engedélyezésre';
 $lang['%d new comment'] = '%d új hozzászólás';
@@ -117,7 +117,7 @@ $lang['Sort by'] = 'Rendezés';
 $lang['Sort order'] = 'Rendezési sorrend';
 $lang['Tag'] = 'Címke';
 $lang['Tags'] = 'Címkék';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'Az RSS értesítő a következő -az oldallal kapcsolatos- információkat tartalmazza: új fotók, új kategóriák, új kommentek.';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'Az RSS értesítő a következő -az oldallal kapcsolatos- információkat tartalmazza: új fotók, új kategóriák, új kommentek.';
 $lang['Unknown feed identifier'] = 'Ismeretlen RSS azonosító';
 $lang['User comments'] = 'Felhasználói hozzászólások';
 $lang['Username'] = 'Felhasználónév';
@@ -133,7 +133,7 @@ $lang['Adviser mode enabled'] = 'Tanácsadói mód engedélyezve';
 $lang['all'] = 'összes';
 $lang['ascending'] = 'növekvő';
 $lang['author(s) : %s'] = 'Szerző(k) : %s';
-$lang['Expand all categories'] = 'Összes kategória kibontása';
+$lang['Expand all albums'] = 'Összes kategória kibontása';
 $lang['posted after %s (%s)'] = 'feltöltve %s (%s) után';
 $lang['posted before %s (%s)'] = 'feltöltve %s (%s) előtt';
 $lang['posted between %s (%s) and %s (%s)'] = 'feltöltve %s (%s) és %s (%s) között';
@@ -189,15 +189,15 @@ $lang['Page generated in'] = 'Oldal készült';
 $lang['guest'] = 'Vendég';
 $lang['Hello'] = 'Szia';
 $lang['available for administrators only'] = 'csak adminisztrátoroknak';
-$lang['shows images at the root of this category'] = 'képek mutatása a kategória gyökeréből';
+$lang['shows images at the root of this album'] = 'képek mutatása a kategória gyökeréből';
 $lang['See last users comments'] = 'Utolsó hozzászólások megjelenítése';
 $lang['customize the appareance of the gallery'] = 'a galéria megjelenésének testreszabása';
 $lang['search'] = 'Keresés';
 $lang['Home'] = 'Főoldal';
 $lang['Identification'] = 'Azonosító';
-$lang['in this category'] = 'ebben a kategóriában';
-$lang['in %d sub-category'] = ' %d kategóriában';
-$lang['in %d sub-categories'] = ' %d kategóriában';
+$lang['in this album'] = 'ebben a kategóriában';
+$lang['in %d sub-album'] = ' %d kategóriában';
+$lang['in %d sub-albums'] = ' %d kategóriában';
 $lang['included'] = 'beleértve';
 $lang['Invalid password!'] = 'Hibás jelszó!';
 $lang['Language'] = 'Nyelv';
@@ -211,7 +211,7 @@ $lang['Maximum height must be a number superior to 50'] = 'A képmagasságnak 50
 $lang['Maximum width of the pictures'] = 'Maximális képszélesség';
 $lang['Maximum width must be a number superior to 50'] = 'A maximális képszélességnek 50-nél nagyobbnak kell lennie!';
 $lang['display a calendar by creation date'] = 'Naptár megjelenítése a készítés dátuma szerint';
-$lang['display all elements in all sub-categories'] = 'Megjelenik az összes elem (alkategóriák is).';
+$lang['display all elements in all sub-albums'] = 'Megjelenik az összes elem (alkategóriák is).';
 $lang['return to normal view mode'] = 'Visszatérés a normál kinézethez';
 $lang['display a calendar by posted date'] = 'Naptár megjelenítése a feltöltés dátuma szerint';
 $lang['month'][10] = 'Október';
@@ -249,8 +249,8 @@ $lang['Preferences'] = 'Beállítások';
 $lang['Previous'] = 'Előző';
 $lang['Random pictures'] = 'Véletlenszerű képek';
 $lang['display a set of random pictures'] = 'Véletlenszerű képek megjelenítése';
-$lang['Recent categories'] = 'Legfrissebb kategória';
-$lang['display recently updated categories'] = 'Utoljára feltöltött kategóriák megjelenítése';
+$lang['Recent albums'] = 'Legfrissebb kategória';
+$lang['display recently updated albums'] = 'Utoljára feltöltött kategóriák megjelenítése';
 $lang['Recent period'] = 'Elmúlt napban';
 $lang['Recent pictures'] = 'Legfrissebb képek';
 $lang['display most recent pictures'] = 'Legfrissebb képek megjelenítése';
@@ -266,7 +266,7 @@ $lang['remove this tag from the list'] = 'Ezt a címkét távolítsa el a listá
 $lang['representative'] = 'képviselő';
 $lang['return to homepage'] = 'Kezdőlap';
 $lang['Search for Author'] = 'Szerző keresése';
-$lang['Search in Categories'] = 'Kategória keresése';
+$lang['Search in albums'] = 'Kategória keresése';
 $lang['Search by Date'] = 'Keresés dátum alapján';
 $lang['Date'] = 'Dátum';
 $lang['End-Date'] = 'Befejező dátum';
@@ -277,10 +277,10 @@ $lang['Search for any terms'] = 'Keresés bármely kifejezésre';
 $lang['Empty query. No criteria has been entered.'] = 'Üres keresés. Nem lett megadva semmilyen keresési szempont.';
 $lang['Search Options'] = 'Keresés beállításai';
 $lang['Search results'] = 'Keresés eredménye';
-$lang['Search in subcategories'] = 'Keresés az alkategóriákban is';
+$lang['Search in sub-albums'] = 'Keresés az alkategóriákban is';
 $lang['searched words : %s'] = 'Keresett kifejezések: %s';
 $lang['Contact'] = 'Kapcsolat:';
-$lang['set as category representative'] = 'Beállítás kategória-képviselőként';
+$lang['set as album representative'] = 'Beállítás kategória-képviselőként';
 $lang['Show number of comments'] = 'Hozzászólások számának mutatása';
 $lang['Show number of hits'] = 'Találatok száma';
 $lang['slideshow'] = 'Diavetítés';
@@ -322,7 +322,7 @@ $lang['User: %s'] = 'Felhasználó: %s';
 $lang['Email: %s'] = 'E-Mail: %s';
 $lang['Admin: %s'] = 'Adminisztrátor: %s';
 $lang['Registration of %s'] = 'Bejegyezte: %s';
-$lang['Category: %s'] = 'Kategória: %s';
+$lang['Album: %s'] = 'Kategória: %s';
 $lang['Picture name: %s'] = 'Kép neve: %s';
 $lang['Creation date: %s'] = 'Létrehozás dátuma: %d';
 $lang['Waiting page: %s'] = 'Tovább a jóváhagyásra váró képek oldalra: %s';
@@ -332,7 +332,7 @@ $lang['Bad status for user "guest", using default status. Please notify the webm
 // --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Adminisztrátor, webmester és különleges felhasználó nem használja ezt a módszert';
 $lang['a user use already this mail address'] = 'Ezt az e-mail címet már egy másik felhasználó használja.';
-$lang['Category results for'] = 'Kategória eredményei';
+$lang['Album results for'] = 'Kategória eredményei';
 $lang['Tag results for'] = 'Címke eredményei';
 $lang['from %s to %s'] = '%s-tól %s-ig';
 $lang['Play of slideshow'] = 'Diavetítés indítása';
diff --git a/language/it_IT/admin.lang.php b/language/it_IT/admin.lang.php
index 40897d9f6..77be6dd17 100644
--- a/language/it_IT/admin.lang.php
+++ b/language/it_IT/admin.lang.php
@@ -25,14 +25,14 @@
 
 $lang['%d association'] = '%d associazione';
 $lang['%d associations'] = '%d associazioni';
-$lang['%d category including'] = '%d categoria compresa';
-$lang['%d categories including'] = '%d categorie comprese ';
+$lang['%d album including'] = '%d categoria compresa';
+$lang['%d albums including'] = '%d categorie comprese ';
 $lang['%d physical'] = '%d fisica';
 $lang['%d physical'] = '%d fisiche';
 $lang[' and %d virtual'] = ' e %d virtuale';
 $lang[' and %d virtual'] = ' e %d virtuali';
-$lang['%d category moved'] = '%d categoria spostata';
-$lang['%d categories moved'] = '%d categorie spostate';
+$lang['%d album moved'] = '%d categoria spostata';
+$lang['%d albums moved'] = '%d categorie spostate';
 $lang['%d group'] = '%d gruppo';
 $lang['%d groups'] = '%d gruppi';
 $lang['%d member'] = '%d utente';
@@ -598,7 +598,7 @@ $lang['overrides existing values with empty ones'] = 'Sovrascrivere i valori esi
 $lang['manage image ranks'] = 'Gestire l\'ordinamento delle immagini';
 $lang['Manage image ranks'] = 'Gestire l\'ordinamento delle immagini';
 $lang['Edit ranks'] = 'Modificare l\'ordine';
-$lang['No element in this category'] = 'Nessun elemento in questa categoria';
+$lang['No element in this album'] = 'Nessun elemento in questa categoria';
 $lang['Images manual order was saved'] = 'L\'ordinamento manuale delle immagini è stato salvato';
 $lang['ranks'] = 'posizioni';
 $lang['By rank'] = 'Per posizione';
diff --git a/language/it_IT/common.lang.php b/language/it_IT/common.lang.php
index 80fb4e1d7..0a78bfc59 100644
--- a/language/it_IT/common.lang.php
+++ b/language/it_IT/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['zero_plural'] = false;
 
 $lang['%.2f (rated %d times)'] = '%.2f (votata %d volte)';
 $lang['%d Kb'] = '%d Ko';
-$lang['%d category updated'] = '%d categoria aggiornata';
-$lang['%d categories updated'] = '%d categorie aggiornate';
+$lang['%d album updated'] = '%d categoria aggiornata';
+$lang['%d albums updated'] = '%d categorie aggiornate';
 $lang['%d comment to validate'] = '%d commento utente da approvare';
 $lang['%d comments to validate'] = '%d commenti utente da approvare';
 $lang['%d new comment'] = '%d nuovo commento utente';
@@ -117,7 +117,7 @@ $lang['Sort by'] = 'Ordina per';
 $lang['Sort order'] = 'Tipo di ordinamento';
 $lang['Tag'] = 'Tag';
 $lang['Tags'] = 'Tags';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'I flussi (Feed) RSS informano sulle novità della galleria: nuove immagini, aggiornamento delle categorie, nuovi commenti. Da usarsi con un lettore di Feed RSS.';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'I flussi (Feed) RSS informano sulle novità della galleria: nuove immagini, aggiornamento delle categorie, nuovi commenti. Da usarsi con un lettore di Feed RSS.';
 $lang['Unknown feed identifier'] = 'Identificatore di flusso sconosciuto';
 $lang['User comments'] = 'Commenti utenti';
 $lang['Username'] = 'Nome utente';
@@ -133,7 +133,7 @@ $lang['Adviser mode enabled'] = 'Modo consigliere attivo';
 $lang['all'] = 'tutto';
 $lang['ascending'] = 'ascendente';
 $lang['author(s) : %s'] = 'autore(i) : %s';
-$lang['Expand all categories'] = 'Espandi tutte le categorie';
+$lang['Expand all albums'] = 'Espandi tutte le categorie';
 $lang['posted after %s (%s)'] = 'disponibile dopo il %s (%s)';
 $lang['posted before %s (%s)'] = 'disponibile prima del %s (%s)';
 $lang['posted between %s (%s) and %s (%s)'] = 'disponibile tra %s (%s) e il %s (%s)';
@@ -189,15 +189,15 @@ $lang['Page generated in'] = 'Pagina generata in';
 $lang['guest'] = 'ospite';
 $lang['Hello'] = 'Ciao';
 $lang['available for administrators only'] = 'Disponibile solo per gli amministratori';
-$lang['shows images at the root of this category'] = 'Mostra le foto alla base di questa categoria';
+$lang['shows images at the root of this album'] = 'Mostra le foto alla base di questa categoria';
 $lang['See last users comments'] = 'Mostra gli ultimi commenti degli utenti';
 $lang['customize the appareance of the gallery'] = 'Personalizza l\'aspetto della galleria';
 $lang['search'] = 'Cerca nella galleria';
 $lang['Home'] = 'Home';
 $lang['Identification'] = 'Identificazione';
-$lang['in this category'] = 'in questa categoria';
-$lang['in %d sub-category'] = 'in %d sottocategoria';
-$lang['in %d sub-categories'] = 'in %d sottocategorie';
+$lang['in this album'] = 'in questa categoria';
+$lang['in %d sub-album'] = 'in %d sottocategoria';
+$lang['in %d sub-albums'] = 'in %d sottocategorie';
 $lang['included'] = 'incluso';
 $lang['Invalid password!'] = 'Password non valida !';
 $lang['Language'] = 'Lingua';
@@ -211,7 +211,7 @@ $lang['Maximum height must be a number superior to 50'] = 'L\'altezza massima de
 $lang['Maximum width of the pictures'] = 'Larghezza massima delle immagini';
 $lang['Maximum width must be a number superior to 50'] = 'La larghezza massima deve essere un numero superiore a 50';
 $lang['display a calendar by creation date'] = 'Mostra il calendario per data di creazione';
-$lang['display all elements in all sub-categories'] = 'Mostra tutti gli elementi in tutte le sottocategorie';
+$lang['display all elements in all sub-albums'] = 'Mostra tutti gli elementi in tutte le sottocategorie';
 $lang['return to normal view mode'] = 'Ritorna alla visualizzazione normale';
 $lang['display a calendar by posted date'] = 'Mostra il calendario per data d\'inserimento nella galleria';
 $lang['month'][10] = 'Ottobre';
@@ -249,8 +249,8 @@ $lang['Preferences'] = 'Preferenze';
 $lang['Previous'] = 'Precendente';
 $lang['Random pictures'] = 'Immagini a caso';
 $lang['display a set of random pictures'] = 'Mostra un set d\'immagini in modo casuale';
-$lang['Recent categories'] = 'Ultime categorie';
-$lang['display recently updated categories'] = 'Mostra le categorie recentemente create o aggiornate';
+$lang['Recent albums'] = 'Ultime categorie';
+$lang['display recently updated albums'] = 'Mostra le categorie recentemente create o aggiornate';
 $lang['Recent period'] = 'Periodo recente';
 $lang['Recent pictures'] = 'Ultime immagini';
 $lang['display most recent pictures'] = 'Mostra le immagini più recenti';
@@ -266,7 +266,7 @@ $lang['remove this tag from the list'] = 'Eliminare questo tag dall\'elenco';
 $lang['representative'] = 'rappresentative';
 $lang['return to homepage'] = 'Torna alla homepage';
 $lang['Search for Author'] = 'Cercare un Autore';
-$lang['Search in Categories'] = 'Cercare nelle categorie';
+$lang['Search in albums'] = 'Cercare nelle categorie';
 $lang['Search by Date'] = 'Cercare per data';
 $lang['Date'] = 'data';
 $lang['End-Date'] = 'Data di fine';
@@ -277,10 +277,10 @@ $lang['Search for any terms'] = 'Cercare una qualsiasi delle parole';
 $lang['Empty query. No criteria has been entered.'] = 'Ricerca incompleta. Nessun criterio di ricerca inserito.';
 $lang['Search Options'] = 'Opzioni di ricerca';
 $lang['Search results'] = 'Risultato della ricerca';
-$lang['Search in subcategories'] = 'Cercare nelle sottocategorie';
+$lang['Search in sub-albums'] = 'Cercare nelle sottocategorie';
 $lang['searched words : %s'] = 'parole cercate : %s';
 $lang['Contact'] = 'Contattare';
-$lang['set as category representative'] = 'Usare questa immagine come copertina della categoria';
+$lang['set as album representative'] = 'Usare questa immagine come copertina della categoria';
 $lang['Show number of comments'] = 'Mostrare il numero dei commenti';
 $lang['Show number of hits'] = 'Mostrare il numero di visualizzazioni';
 $lang['slideshow'] = 'Avviare la proiezione di diapositive';
@@ -322,7 +322,7 @@ $lang['User: %s'] = 'Utente: %s';
 $lang['Email: %s'] = 'Email: %s';
 $lang['Admin: %s'] = 'Amministrazione: %s';
 $lang['Registration of %s'] = 'Registrazione di %s';
-$lang['Category: %s'] = 'Categoria: %s';
+$lang['Album: %s'] = 'Categoria: %s';
 $lang['Picture name: %s'] = 'Nome dell\'immagine: %s';
 $lang['Creation date: %s'] = 'Data di creazione: %d';
 $lang['Waiting page: %s'] = 'Pagina in attesa: %s';
@@ -332,7 +332,7 @@ $lang['Bad status for user "guest", using default status. Please notify the webm
 // --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Amministratore, webmaster e utente speciale non possono utilizzare questo metodo';
 $lang['a user use already this mail address'] = 'un utente usa già questo indirizzo mail';
-$lang['Category results for'] = 'Risultato delle categorie per';
+$lang['Album results for'] = 'Risultato delle categorie per';
 $lang['Tag results for'] = 'Risultato dei tag per';
 $lang['from %s to %s'] = 'da %s a %s';
 $lang['Play of slideshow'] = 'Avvia proiezione';
diff --git a/language/ja_JP/admin.lang.php b/language/ja_JP/admin.lang.php
index 43a361bb2..f8e8a6e79 100644
--- a/language/ja_JP/admin.lang.php
+++ b/language/ja_JP/admin.lang.php
@@ -23,14 +23,14 @@
 
 $lang['%d association'] = '関連:%d';
 $lang['%d associations'] = '関連:%d';
-$lang['%d category including'] = 'カテゴリ:%d  - ';
-$lang['%d categories including'] = 'カテゴリ:%d  - ';
+$lang['%d album including'] = 'カテゴリ:%d  - ';
+$lang['%d albums including'] = 'カテゴリ:%d  - ';
 $lang['%d physical'] = '物理ディレクトリ:%d ';
 $lang['%d physical'] = '物理ディレクトリ:%d ';
 $lang[' and %d virtual'] = 'バーチャルディレクトリ:%d ';
 $lang[' and %d virtual'] = 'バーチャルディレクトリ:%d ';
-$lang['%d category moved'] = '%d 件のカテゴリが移動されました。';
-$lang['%d categories moved'] = '%d 件のカテゴリが移動されました。';
+$lang['%d album moved'] = '%d 件のカテゴリが移動されました。';
+$lang['%d albums moved'] = '%d 件のカテゴリが移動されました。';
 $lang['%d group'] = 'グループ:%d';
 $lang['%d groups'] = 'グループ:%d';
 $lang['%d member'] = 'メンバー:%d';
@@ -597,7 +597,7 @@ $lang['overrides existing values with empty ones'] = '既存の値を空白に�
 $lang['manage image ranks'] = 'イメージランクを管理する';
 $lang['Manage image ranks'] = 'イメージランクを管理する';
 $lang['Edit ranks'] = 'ランクを編集する';
-$lang['No element in this category'] = 'このカテゴリには、エレメントがありません。';
+$lang['No element in this album'] = 'このカテゴリには、エレメントがありません。';
 $lang['Images manual order was saved'] = 'イメージ手動並び替えが保存されました。';
 $lang['ranks'] = 'ランク';
 $lang['Drag to re-order'] = 'ドラッグして並び替え';
diff --git a/language/ja_JP/common.lang.php b/language/ja_JP/common.lang.php
index 60545cfc5..e8b1600fb 100644
--- a/language/ja_JP/common.lang.php
+++ b/language/ja_JP/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['zero_plural'] = true;
 
 $lang['%.2f (rated %d times)'] = '%.2f (評価 %d 回)';
 $lang['%d Kb'] = '%d Kb';
-$lang['%d category updated'] = '%d 件のカテゴリが更新されました。';
-$lang['%d categories updated'] = '%d 件のカテゴリが更新されました。';
+$lang['%d album updated'] = '%d 件のカテゴリが更新されました。';
+$lang['%d albums updated'] = '%d 件のカテゴリが更新されました。';
 $lang['%d comment to validate'] = '%d 件のコメントが承認されました。';
 $lang['%d comments to validate'] = '%d 件のコメントが承認されました。';
 $lang['%d new comment'] = '新しいコメント: %d';
@@ -117,7 +117,7 @@ $lang['Sort by'] = '並び替え';
 $lang['Sort order'] = '並び順';
 $lang['Tag'] = 'タグ';
 $lang['Tags'] = 'タグ';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'RSS通知フィードでは、このウェブサイトからニュースを通知します : 新しい写真、更新カテゴリ、新しいコメント。RSSフィードリーダーをお使いください。';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'RSS通知フィードでは、このウェブサイトからニュースを通知します : 新しい写真、更新カテゴリ、新しいコメント。RSSフィードリーダーをお使いください。';
 $lang['Unknown feed identifier'] = '不明なフィードIDです。';
 $lang['User comments'] = 'ユーザコメント';
 $lang['Username'] = 'ユーザ名';
@@ -133,7 +133,7 @@ $lang['Adviser mode enabled'] = 'アドバイザーモードが有効にされ�
 $lang['all'] = 'すべて';
 $lang['ascending'] = '昇順';
 $lang['author(s) : %s'] = '作者 : %s';
-$lang['Expand all categories'] = 'すべてのカテゴリを拡げる';
+$lang['Expand all albums'] = 'すべてのカテゴリを拡げる';
 $lang['posted after %s (%s)'] = '%s (%s) 以降に投稿';
 $lang['posted before %s (%s)'] = '%s (%s) 以前に投稿';
 $lang['posted between %s (%s) and %s (%s)'] = '%s (%s) から %s (%s) の間に投稿';
@@ -189,15 +189,15 @@ $lang['Page generated in'] = 'ページ作成:';
 $lang['guest'] = 'ゲスト';
 $lang['Hello'] = 'こんにちは';
 $lang['available for administrators only'] = '管理者のみ利用可能です。';
-$lang['shows images at the root of this category'] = 'このカテゴリのルートのイメージを表示する';
+$lang['shows images at the root of this album'] = 'このカテゴリのルートのイメージを表示する';
 $lang['See last users comments'] = '最新のユーザコメントを表示する';
 $lang['customize the appareance of the gallery'] = 'ギャラリーのアピアランスをカスタマイズする';
 $lang['search'] = '検索';
 $lang['Home'] = 'ホーム';
 $lang['Identification'] = 'アイデンティフィケーション';
-$lang['in this category'] = '- このカテゴリ';
-$lang['in %d sub-category'] = '- %d サブカテゴリ';
-$lang['in %d sub-categories'] = '- %d サブカテゴリ';
+$lang['in this album'] = '- このカテゴリ';
+$lang['in %d sub-album'] = '- %d サブカテゴリ';
+$lang['in %d sub-albums'] = '- %d サブカテゴリ';
 $lang['included'] = '含む';
 $lang['Invalid password!'] = 'パスワードが正しくありません!';
 $lang['Language']='言語';
@@ -211,7 +211,7 @@ $lang['Maximum height must be a number superior to 50'] = '最大高は、50以�
 $lang['Maximum width of the pictures'] = '写真の最大幅';
 $lang['Maximum width must be a number superior to 50'] = '最大幅は、50以上に設定してください。';
 $lang['display a calendar by creation date'] = '作成日のカレンダーを表示する';
-$lang['display all elements in all sub-categories'] = 'すべてのサブカテゴリのエレメント表示する';
+$lang['display all elements in all sub-albums'] = 'すべてのサブカテゴリのエレメント表示する';
 $lang['return to normal view mode'] = 'ノーマルビューモードに戻る';
 $lang['display a calendar by posted date'] = '投稿日のカレンダーを表示する';
 $lang['month'][10] = '10月';
@@ -249,8 +249,8 @@ $lang['Preferences'] = 'プリファレンス';
 $lang['Previous'] = '前へ';
 $lang['Random pictures'] = 'ランダム写真';
 $lang['display a set of random pictures'] = '一連のランダム写真を表示します。';
-$lang['Recent categories'] = '最近のカテゴリ';
-$lang['display recently updated categories'] = '最近更新されたカテゴリを表示します。';
+$lang['Recent albums'] = '最近のカテゴリ';
+$lang['display recently updated albums'] = '最近更新されたカテゴリを表示します。';
 $lang['Recent period'] = '最近の期間';
 $lang['Recent pictures'] = '最近の写真';
 $lang['display most recent pictures'] = '最近の写真を表示します。';
@@ -266,7 +266,7 @@ $lang['remove this tag from the list'] = 'このタグをリストから削除�
 $lang['representative'] = '見本';
 $lang['return to homepage'] = 'ホームページに戻る';
 $lang['Search for Author'] = '作者で探す';
-$lang['Search in Categories'] = 'カテゴリを探す';
+$lang['Search in albums'] = 'カテゴリを探す';
 $lang['Search by Date'] = '日付で探す';
 $lang['Date'] = '日付';
 $lang['End-Date'] = '終了日';
@@ -277,10 +277,10 @@ $lang['Search for any terms'] = '少なくとも一つを含む';
 $lang['Empty query. No criteria has been entered.'] = '空のクエリーです。検索キーワードが入力されていません。';
 $lang['Search Options'] = '検索オプション';
 $lang['Search results'] = '検索結果';
-$lang['Search in subcategories'] = 'サブカテゴリを探す';
+$lang['Search in sub-albums'] = 'サブカテゴリを探す';
 $lang['searched words : %s'] = '検索キーワード : %s';
 $lang['Contact'] = '連絡:';
-$lang['set as category representative'] = 'カテゴリ見本を設定する';
+$lang['set as album representative'] = 'カテゴリ見本を設定する';
 $lang['Show number of comments'] = 'コメント数を表示する';
 $lang['Show number of hits'] = 'ヒット数を表示する';
 $lang['slideshow'] = 'スライドショー';
@@ -322,7 +322,7 @@ $lang['User: %s'] = 'ユーザ: %s';
 $lang['Email: %s'] = 'メールアドレス: %s';
 $lang['Admin: %s'] = '管理者: %s';
 $lang['Registration of %s'] = '%s の登録';
-$lang['Category: %s'] = 'カテゴリ: %s';
+$lang['Album: %s'] = 'カテゴリ: %s';
 $lang['Picture name: %s'] = '写真名: %s';
 $lang['Creation date: %s'] = '作成日: %s';
 $lang['Waiting page: %s'] = '待ちページ: %s';
@@ -332,7 +332,7 @@ $lang['Bad status for user "guest", using default status. Please notify the webm
 // --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = '管理者、ウェブマスタおよび特別ユーザは、この方法を使用できません。';
 $lang['a user use already this mail address'] = 'このメールアドレスは、すでに他のユーザに使用されています。';
-$lang['Category results for'] = 'カテゴリ検索結果:';
+$lang['Album results for'] = 'カテゴリ検索結果:';
 $lang['Tag results for'] = 'タグ検索結果:';
 $lang['from %s to %s'] = '%s - %s';
 $lang['Play of slideshow'] = 'スライドショーを実行する';
diff --git a/language/ka_GE/admin.lang.php b/language/ka_GE/admin.lang.php
index 2583a67d9..f56217def 100644
--- a/language/ka_GE/admin.lang.php
+++ b/language/ka_GE/admin.lang.php
@@ -23,14 +23,14 @@
 
 $lang['%d association'] = '%d კავშირი';
 $lang['%d associations'] = '%d კავშირი';
-$lang['%d category including'] = '%d კატეგორია დამატებულია ';
-$lang['%d categories including'] = 'დამატებული კატეგორიები: %d';
+$lang['%d album including'] = '%d კატეგორია დამატებულია ';
+$lang['%d albums including'] = 'დამატებული კატეგორიები: %d';
 $lang['%d physical'] = '%d რეალური';
 $lang['%d physical'] = '%d რეალური';
 $lang[' and %d virtual'] = ' და %d ვირტუალური';
 $lang[' and %d virtual'] = ' და %d ვირტუალური';
-$lang['%d category moved'] = '%d კატეგორია გადატანილია';
-$lang['%d categories moved'] = '%d კატეგორია გადატანილია';
+$lang['%d album moved'] = '%d კატეგორია გადატანილია';
+$lang['%d albums moved'] = '%d კატეგორია გადატანილია';
 $lang['%d group'] = '%d ჯგუფი';
 $lang['%d groups'] = '%d ჯგუფი';
 $lang['%d member'] = '%d მონაწილე';
@@ -606,7 +606,7 @@ $lang['overrides existing values with empty ones'] = 'შევცვალო�
 $lang['manage image ranks'] = 'ფოტოების მართვის წესი';
 $lang['Manage image ranks'] = 'ფოტოების მართვის წესი';
 $lang['Edit ranks'] = 'შევცვალოთ წესი';
-$lang['No element in this category'] = 'ცარიელი კატეგორია';
+$lang['No element in this album'] = 'ცარიელი კატეგორია';
 $lang['Images manual order was saved'] = 'ფოტოებისთვის აღნიშნული წესი შენახულია';
 $lang['ranks'] = 'წესი';
 $lang['Drag to re-order'] = 'გადმოიტანეთ რათა შეცვალოთ წესი';
diff --git a/language/ka_GE/common.lang.php b/language/ka_GE/common.lang.php
index 108171106..22deecc86 100644
--- a/language/ka_GE/common.lang.php
+++ b/language/ka_GE/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['zero_plural'] = true;
 
 $lang['%.2f (rated %d times)'] = '%.2f (%d შეფასება)';
 $lang['%d Kb'] = '%d კბ';
-$lang['%d category updated'] = '%d კატეგორიაა დამატებული';
-$lang['%d categories updated'] = 'დამატებული კატეგორიები: %d';
+$lang['%d album updated'] = '%d კატეგორიაა დამატებული';
+$lang['%d albums updated'] = 'დამატებული კატეგორიები: %d';
 $lang['%d comment to validate'] = '%d შესამოწმებელი კომენტარი';
 $lang['%d comments to validate'] = 'შესამოწმებელი კომენტარები: %d';
 $lang['%d new comment'] = '%d ახალი კომენტარი';
@@ -117,7 +117,7 @@ $lang['Sort by'] = 'სორტირება';
 $lang['Sort order'] = 'სორტირების წესი';
 $lang['Tag'] = 'სიტყვა';
 $lang['Tags'] = 'საძიებო სიტყვები';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'RSS შეტყობინებები გიამბობენ ახალ ფოტოებზე, გალერეის განახლებაზე, ახალ კომენტარებზე. ამისათვის გამოიყენეთ RSS-წამკითხველი.';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'RSS შეტყობინებები გიამბობენ ახალ ფოტოებზე, გალერეის განახლებაზე, ახალ კომენტარებზე. ამისათვის გამოიყენეთ RSS-წამკითხველი.';
 $lang['Unknown feed identifier'] = 'ლენტის გაურკვეველი იდენტიფიკატორი';
 $lang['User comments'] = 'მნახველების კომენტარები';
 $lang['Username'] = 'მომხმარებლის სახელი';
@@ -133,7 +133,7 @@ $lang['Adviser mode enabled'] = 'ჩავრთოთ შეხსენებ�
 $lang['all'] = 'ყველა';
 $lang['ascending'] = 'ზრდის მიხედვით';
 $lang['author(s) : %s'] = 'ავტორი(ები) : %s';
-$lang['Expand all categories'] = 'გავხსნათ ყველა კატეგორია';
+$lang['Expand all albums'] = 'გავხსნათ ყველა კატეგორია';
 $lang['posted after %s (%s)'] = 'გამოქვეყნებულია %s (%s) შემდეგ';
 $lang['posted before %s (%s)'] = 'გამოქვეყნებულია  %s (%s) მდე';
 $lang['posted between %s (%s) and %s (%s)'] = 'გამოქვეყნებულია %s (%s) და %s (%s) შორის';
@@ -189,15 +189,15 @@ $lang['Page generated in'] = 'გვერდი გენერირები�
 $lang['guest'] = 'სტუმარი';
 $lang['Hello'] = 'გამარჯობა';
 $lang['available for administrators only'] = 'დაშვება მხოლოდ ადმინისტრატორისათვის';
-$lang['shows images at the root of this category'] = 'ვნახოთ ფოტოები კატეგორიის ძირიდან';
+$lang['shows images at the root of this album'] = 'ვნახოთ ფოტოები კატეგორიის ძირიდან';
 $lang['See last users comments'] = 'მომხმარებლების ბოლო კომენტარები';
 $lang['customize the appareance of the gallery'] = 'გაფორმების გასწორება';
 $lang['search'] = 'ძიება';
 $lang['Home'] = 'Home';
 $lang['Identification'] = 'შესვლა';
-$lang['in this category'] = 'ამ კატეგირიაში';
-$lang['in %d sub-category'] = ' %d ქვეკატეგორიაში';
-$lang['in %d sub-categories'] = '( %d ქვეკატეგორიებში)';
+$lang['in this album'] = 'ამ კატეგირიაში';
+$lang['in %d sub-album'] = ' %d ქვეკატეგორიაში';
+$lang['in %d sub-albums'] = '( %d ქვეკატეგორიებში)';
 $lang['included'] = 'ჩართულია';
 $lang['Invalid password!'] = 'არასწორი პაროლი!';
 $lang['Language']='ენა';
@@ -211,7 +211,7 @@ $lang['Maximum height must be a number superior to 50'] = 'სურათის
 $lang['Maximum width of the pictures'] = 'სურათის მაქსიმალური სიგანე';
 $lang['Maximum width must be a number superior to 50'] = 'სურათის მაქსიმალური სიგანე უნდა იყოს 50–ზე მეტი';
 $lang['display a calendar by creation date'] = ' ვნახოთ კალენდარი შექმნის თარიღით';
-$lang['display all elements in all sub-categories'] = ' ვნახოთ ყველა ფოტო ყველა ქვეკატეგორიებში';
+$lang['display all elements in all sub-albums'] = ' ვნახოთ ყველა ფოტო ყველა ქვეკატეგორიებში';
 $lang['return to normal view mode'] = 'ჩვეულებრივ რეჯიმში დაბრუნება';
 $lang['display a calendar by posted date'] = ' ვნახოთ კალენდარი გაგზავნის დროის მიხედვით';
 $lang['month'][10] = 'ოქტომბერი';
@@ -250,8 +250,8 @@ $lang['Preferences'] = 'უპირატესი';
 $lang['Previous'] = 'წინა';
 $lang['Random pictures'] = 'შემთხვევითი';
 $lang['display a set of random pictures'] = 'რამდენიმე შემთხვევითი ფოტო';
-$lang['Recent categories'] = 'ახალი გალერეები';
-$lang['display recently updated categories'] = 'ვნახოთ განახლებული გალერეები';
+$lang['Recent albums'] = 'ახალი გალერეები';
+$lang['display recently updated albums'] = 'ვნახოთ განახლებული გალერეები';
 $lang['Recent period'] = '"ახლების" ვადა';
 $lang['Recent pictures'] = 'ახალი ფოტოები';
 $lang['display most recent pictures'] = 'ვნახოთ ახალი ფოტოები';
@@ -267,7 +267,7 @@ $lang['remove this tag from the list'] = 'გადავაგდოთ ეს
 $lang['representative'] = 'წარმომადგენელი';
 $lang['return to homepage'] = 'დავბრუნდეთ მთავარ გვერდზე';
 $lang['Search for Author'] = 'ძიება ავტორის მიხედვით';
-$lang['Search in Categories'] = 'ძიება კატეგორიებში';
+$lang['Search in albums'] = 'ძიება კატეგორიებში';
 $lang['Search by Date'] = 'ძიება თარიღით';
 $lang['Date'] = 'საწყისი თარიღი';
 $lang['End-Date'] = 'საბოლოო თარიღი';
@@ -278,11 +278,11 @@ $lang['Search for any terms'] = 'ძიება ნებისმიერი
 $lang['Empty query. No criteria has been entered.'] = 'ცარიელი მოთხოვნა. ძიების კრიტერიუმი არ რსებობს.';
 $lang['Search Options'] = 'ძიების ვარიანტი';
 $lang['Search results'] = 'ძიების რეზულტატი';
-$lang['Search in subcategories'] = 'ქვეკატეგორიებშიც';
+$lang['Search in sub-albums'] = 'ქვეკატეგორიებშიც';
 $lang['Search'] = 'ძიება';
 $lang['searched words : %s'] = 'მოსაძებნი სიტყვები: %s';
 $lang['Contact'] = 'კონტაქტი';
-$lang['set as category representative'] = 'გავხადოთ კატეგორიის წარმომადგენელი';
+$lang['set as album representative'] = 'გავხადოთ კატეგორიის წარმომადგენელი';
 $lang['Show number of comments'] = 'ვაჩვენოთ კომენტარების რაოდენობა';
 $lang['Show number of hits'] = 'ვაჩვენოთ ნახვების რაოდენობა';
 $lang['slideshow'] = ' სლაიდშოუ';
@@ -325,7 +325,7 @@ $lang['User: %s'] = 'სტუმარი: %s';
 $lang['Email: %s'] = 'მისამართი: %s';
 $lang['Admin: %s'] = 'ადმინისტრატორი: %s';
 $lang['Registration of %s'] = 'რეგისტრაცია %s';
-$lang['Category: %s'] = 'კატეგორია: %s';
+$lang['Album: %s'] = 'კატეგორია: %s';
 $lang['Picture name: %s'] = 'სახელი: %s';
 $lang['Creation date: %s'] = 'გადაღების დრო: %s';
 $lang['Waiting page: %s'] = 'მოცდის გვერდი: %s';
@@ -335,7 +335,7 @@ $lang['Bad status for user "guest", using default status. Please notify the webm
 // --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webmaster and special user cannot use this method';
 $lang['a user use already this mail address'] = 'მომხმარებელი ასეთი მისამართით უკვე არსებობს';
-$lang['Category results for'] = 'დღის კატეგორიების რეზულტატი';
+$lang['Album results for'] = 'დღის კატეგორიების რეზულტატი';
 $lang['Tag results for'] = 'დღის სიტყვა–რეზულტატი';
 $lang['from %s to %s'] = ' %s დან  %s მდე';
 $lang['Play of slideshow'] = 'ვნახოთ სლაიდშოუ';
diff --git a/language/mk_MK/common.lang.php b/language/mk_MK/common.lang.php
index 7b0d7c971..462f364ac 100644
--- a/language/mk_MK/common.lang.php
+++ b/language/mk_MK/common.lang.php
@@ -34,8 +34,8 @@ $lang_info['zero_plural'] = true;
 
 $lang['%.2f (rated %d times)'] = '%.2f оценета %d пат';
 $lang['%d Kb'] = '%d килобајти';
-$lang['%d category updated'] = '%d категорија беше обновена';
-$lang['%d categories updated'] = '%d категории беа обновени';
+$lang['%d album updated'] = '%d категорија беше обновена';
+$lang['%d albums updated'] = '%d категории беа обновени';
 $lang['%d comment to validate'] = '%d коментар чека валидирање';
 $lang['%d comments to validate'] = '%d коментари чекаат валидирање';
 $lang['%d new comment'] = '%d нов коментар';
@@ -126,7 +126,7 @@ $lang['Sort by'] = 'Подреди ги по';
 $lang['Sort order'] = 'Подредување по';
 $lang['Tag'] = 'Етикета';
 $lang['Tags'] = 'Етикети';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'Really Simple Syndication функцијата обезбедува известувања кога се прикачуваат нови фотографии и пишуваат нови коментари. Потребно е да имате RSS feed reader. Повеќе информации може да најдете <a href="http://en.wikipedia.org/wiki/RSS_(file_format)">тука.</a>';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'Really Simple Syndication функцијата обезбедува известувања кога се прикачуваат нови фотографии и пишуваат нови коментари. Потребно е да имате RSS feed reader. Повеќе информации може да најдете <a href="http://en.wikipedia.org/wiki/RSS_(file_format)">тука.</a>';
 $lang['Unknown feed identifier'] = 'Непознат feed.';
 $lang['User comments'] = 'Коментари од корисниците';
 $lang['Username'] = 'Член';
@@ -142,7 +142,7 @@ $lang['Adviser mode enabled'] = 'Adviser mode enabled';
 $lang['all'] = 'сите';
 $lang['ascending'] = 'хоризонтален ред';
 $lang['author(s) : %s'] = 'автор(и) : %s';
-$lang['Expand all categories'] = 'Отвори ги сите категории на насловната';
+$lang['Expand all albums'] = 'Отвори ги сите категории на насловната';
 $lang['posted after %s (%s)'] = 'објавено по %s (%s)';
 $lang['posted before %s (%s)'] = 'објавено пред %s (%s)';
 $lang['posted between %s (%s) and %s (%s)'] = 'објавено помеѓу %s (%s) и %s (%s)';
@@ -198,15 +198,15 @@ $lang['Page generated in'] = 'Страницата беше генерирана
 $lang['guest'] = 'гостин';
 $lang['Hello'] = 'Здраво';
 $lang['available for administrators only'] = 'Пристапот не е дозволен.';
-$lang['shows images at the root of this category'] = 'Покажи фотографии од коренот на оваа категорија';
+$lang['shows images at the root of this album'] = 'Покажи фотографии од коренот на оваа категорија';
 $lang['See last users comments'] = 'Погледни ги последните коментари од членовите';
 $lang['customize the appareance of the gallery'] = 'Промени ги твоите лични подесувања';
 $lang['search'] = 'барај';
 $lang['Home'] = 'Почетна';
 $lang['Identification'] = 'Профил';
-$lang['in this category'] = 'во оваа категорија';
-$lang['in %d sub-category'] = 'во %d подкатегорија';
-$lang['in %d sub-categories'] = 'во %d подкатегории';
+$lang['in this album'] = 'во оваа категорија';
+$lang['in %d sub-album'] = 'во %d подкатегорија';
+$lang['in %d sub-albums'] = 'во %d подкатегории';
 $lang['included'] = 'вклучено';
 $lang['Invalid password!'] = 'Лозинката е погрешна!';
 $lang['Language']='Јазик';
@@ -220,7 +220,7 @@ $lang['Maximum height must be a number superior to 50'] = 'Максимална�
 $lang['Maximum width of the pictures'] = 'Максимална ширина на фотографиите';
 $lang['Maximum width must be a number superior to 50'] = 'Максималната ширина мора да е број поголем од 50';
 $lang['display a calendar by creation date'] = 'Го покажува календарот по дата на создавање';
-$lang['display all elements in all sub-categories'] = 'Ги покажува сите елементи во сите подкатегории';
+$lang['display all elements in all sub-albums'] = 'Ги покажува сите елементи во сите подкатегории';
 $lang['return to normal view mode'] = 'Врати се кон нормалниот преглед';
 $lang['display a calendar by posted date'] = 'Го покажува календарот по дата на испраќање';
 $lang['month'][10] = 'октомври';
@@ -258,8 +258,8 @@ $lang['Preferences'] = 'Подесувања';
 $lang['Previous'] = 'Претходна';
 $lang['Random pictures'] = 'Случајни фотографии';
 $lang['display a set of random pictures'] = 'Ги покажува случајните фотографии';
-$lang['Recent categories'] = 'Нови категории';
-$lang['display recently updated categories'] = 'Ги покажува најновите категории';
+$lang['Recent albums'] = 'Нови категории';
+$lang['display recently updated albums'] = 'Ги покажува најновите категории';
 $lang['Recent period'] = 'До колку денови фотографиите ги сметате за "нови"?';
 $lang['Recent pictures'] = 'Нови фотографии';
 $lang['display most recent pictures'] = 'Ги покажува најновите фотографии';
@@ -276,7 +276,7 @@ $lang['representative'] = 'главна икона';
 $lang['return to homepage'] = 'Врати се на почетната страница';
 $lang['search'] = 'Пребарување';
 $lang['Search for Author'] = 'Барај по автор';
-$lang['Search in Categories'] = 'Барај по категории';
+$lang['Search in albums'] = 'Барај по категории';
 $lang['Search by Date'] = 'Барај по дата';
 $lang['Date'] = 'Почетна дата';
 $lang['End-Date'] = 'Крајна дата';
@@ -287,10 +287,10 @@ $lang['Search for any terms'] = 'Барај по било кој термин';
 $lang['Empty query. No criteria has been entered.'] = 'Не внесовте ниту еден збор.';
 $lang['Search Options'] = 'Опции за пребарување';
 $lang['Search results'] = 'Резултати од пребарувањето';
-$lang['Search in subcategories'] = 'Барај по подкатегории';
+$lang['Search in sub-albums'] = 'Барај по подкатегории';
 $lang['searched words : %s'] = 'барани зборови : %s';
 $lang['Contact'] = 'Контакт';
-$lang['set as category representative'] = 'Намести ја како главна икона за категорија';
+$lang['set as album representative'] = 'Намести ја како главна икона за категорија';
 $lang['Show number of comments'] = 'Покажи го бројот на коментарите?';
 $lang['Show number of hits'] = 'Покажи го бројот на прегледи?';
 $lang['slideshow'] = 'Презентација';
@@ -331,7 +331,7 @@ $lang['User: %s'] = 'Корисник: %s';
 $lang['Email: %s'] = 'Email: %s';
 $lang['Admin: %s'] = 'Admin: %s';
 $lang['Registration of %s'] = 'Registration of %s';
-$lang['Category: %s'] = 'Категорија: %s';
+$lang['Album: %s'] = 'Категорија: %s';
 $lang['Picture name: %s'] = 'Име на фотографијата: %s';
 $lang['Creation date: %s'] = 'Дата на создавање: %s';
 $lang['Waiting page: %s'] = 'Страна на чекање: %s';
diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php
index 9e6070b77..0cd970a79 100644
--- a/language/nl_NL/admin.lang.php
+++ b/language/nl_NL/admin.lang.php
@@ -23,14 +23,14 @@
 
 $lang['%d association'] = '%d associatie';
 $lang['%d associations'] = '%d associaties';
-$lang['%d category including'] = '%d categorie waarvan ';
-$lang['%d categories including'] = '%d categorieën waarvan ';
+$lang['%d album including'] = '%d categorie waarvan ';
+$lang['%d albums including'] = '%d categorieën waarvan ';
 $lang['%d physical'] = '%d fysiek';
 $lang['%d physical'] = '%d fysiek';
 $lang[' and %d virtual'] = ' en %d virtueel';
 $lang[' and %d virtual'] = ' en %d virtueel';
-$lang['%d category moved'] = '%d categorie verplaatst';
-$lang['%d categories moved'] = '%d categorieën verplaatst';
+$lang['%d album moved'] = '%d categorie verplaatst';
+$lang['%d albums moved'] = '%d categorieën verplaatst';
 $lang['%d group'] = '%d groep';
 $lang['%d groups'] = '%d groepen';
 $lang['%d member'] = '%d lid';
@@ -607,7 +607,7 @@ $lang['Correction the anomaly will cancel the fact that it\'s ignored'] = 'Het c
 $lang['manage image ranks'] = 'bewerk de afbeeldingsrangen';
 $lang['Manage image ranks'] = 'Bewerk de afbeeldingsrangen';
 $lang['Edit ranks'] = 'Bewerk de rangen';
-$lang['No element in this category'] = 'Geen element in deze categorie';
+$lang['No element in this album'] = 'Geen element in deze categorie';
 $lang['Images manual order was saved'] = 'De handmatige sortering van de afbeeldingen is bewaard';
 $lang['ranks'] = 'Rangen';
 $lang['Piwigo Announcements Newsletter'] = 'Piwigo Aankondigings Nieuwsbrief';
diff --git a/language/nl_NL/common.lang.php b/language/nl_NL/common.lang.php
index db4e529f4..7944da692 100644
--- a/language/nl_NL/common.lang.php
+++ b/language/nl_NL/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['zero_plural'] = true;
 
 $lang['%.2f (rated %d times)'] = '%.2f (waardering %d aantal x)';
 $lang['%d Kb'] = '%d Kb';
-$lang['%d category updated'] = '%d categorie bijgewerkt';
-$lang['%d categories updated'] = '%d categorieën bijgewerkt';
+$lang['%d album updated'] = '%d categorie bijgewerkt';
+$lang['%d albums updated'] = '%d categorieën bijgewerkt';
 $lang['%d comment to validate'] = '%d commentaar voor validatie';
 $lang['%d comments to validate'] = '%d commentaren voor validatie';
 $lang['%d new comment'] = '%d nieuw commentaar';
@@ -117,7 +117,7 @@ $lang['Sort by'] = 'Sorteren op';
 $lang['Sort order'] = 'Sorteervolgorde';
 $lang['Tag'] = 'Tag';
 $lang['Tags'] = 'Tags';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'De RSS feed geeft meldingen als er nieuws is op deze website: nieuwe afbeeldingen, bijgewerkte categorieën, nieuw commentaar. Gebruik hiervoor een rss lezer.';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'De RSS feed geeft meldingen als er nieuws is op deze website: nieuwe afbeeldingen, bijgewerkte categorieën, nieuw commentaar. Gebruik hiervoor een rss lezer.';
 $lang['Unknown feed identifier'] = 'Onbekende feed identifier';
 $lang['User comments'] = 'Gebruikers-commentaar';
 $lang['Username'] = 'Gebruikersnaam';
@@ -133,7 +133,7 @@ $lang['Adviser mode enabled'] = 'Adviseursmode geactiveerd';
 $lang['all'] = 'alle';
 $lang['ascending'] = 'Oplopend';
 $lang['author(s) : %s'] = 'Maker : %s';
-$lang['Expand all categories'] = 'Toon alle categorieën';
+$lang['Expand all albums'] = 'Toon alle categorieën';
 $lang['posted after %s (%s)'] = 'geplaatst na %s (%s)';
 $lang['posted before %s (%s)'] = 'geplaatst voor %s (%s)';
 $lang['posted between %s (%s) and %s (%s)'] = 'geplaatst tussen %s (%s) en %s (%s)';
@@ -189,15 +189,15 @@ $lang['Page generated in'] = 'Pagina gegenereerd in';
 $lang['guest'] = 'gast';
 $lang['Hello'] = 'Hallo';
 $lang['available for administrators only'] = 'Alleen voor beheerders';
-$lang['shows images at the root of this category'] = 'Toont afbeeldingen van het begin van de categorie';
+$lang['shows images at the root of this album'] = 'Toont afbeeldingen van het begin van de categorie';
 $lang['See last users comments'] = 'Bekijk de laatste gebruikerscommentaren';
 $lang['customize the appareance of the gallery'] = 'Weergave van de galerie aanpassen';
 $lang['search'] = 'zoeken';
 $lang['Home'] = 'Startpagina';
 $lang['Identification'] = 'Administratie';
-$lang['in this category'] = 'in deze categorie';
-$lang['in %d sub-category'] = 'in %d sub-categorie';
-$lang['in %d sub-categories'] = 'in %d sub-categorieën';
+$lang['in this album'] = 'in deze categorie';
+$lang['in %d sub-album'] = 'in %d sub-categorie';
+$lang['in %d sub-albums'] = 'in %d sub-categorieën';
 $lang['included'] = 'inclusief';
 $lang['Invalid password!'] = 'Verkeerd wachtwoord!';
 $lang['Language'] = 'Taal';
@@ -211,7 +211,7 @@ $lang['Maximum height must be a number superior to 50'] = 'Maximale hoogte moet
 $lang['Maximum width of the pictures'] = 'Maximale breedte van de afbeelding';
 $lang['Maximum width must be a number superior to 50'] = 'Maximale breedte moet meer zijn dan 50';
 $lang['display a calendar by creation date'] = 'Toon afbeeldingen gesorteerd op aanmaakdatum';
-$lang['display all elements in all sub-categories'] = 'Toon alle afbeeldingen in alle sub-categorieën';
+$lang['display all elements in all sub-albums'] = 'Toon alle afbeeldingen in alle sub-categorieën';
 $lang['return to normal view mode'] = 'Terug naar de standaardweergave';
 $lang['display a calendar by posted date'] = 'Toon afbeeldingen gesorteerd op plaatsingsdatum';
 $lang['month'][10] = 'Oktober';
@@ -249,8 +249,8 @@ $lang['Preferences'] = 'Voorkeuren';
 $lang['Previous'] = 'Vorige';
 $lang['Random pictures'] = 'Willekeurige afbeeldingen';
 $lang['display a set of random pictures'] = 'toon een set van willekeurige afbeeldingen';
-$lang['Recent categories'] = 'Recente categorieën';
-$lang['display recently updated categories'] = 'toon recentelijk bijgewerkte categorieën';
+$lang['Recent albums'] = 'Recente categorieën';
+$lang['display recently updated albums'] = 'toon recentelijk bijgewerkte categorieën';
 $lang['Recent period'] = 'Recente periode (aantal dagen)';
 $lang['Recent pictures'] = 'Recente afbeeldingen';
 $lang['display most recent pictures'] = 'toon meest recente afbeelding';
@@ -266,7 +266,7 @@ $lang['remove this tag from the list'] = 'Verwijder deze tag van de lijst';
 $lang['representative'] = 'representatief';
 $lang['return to homepage'] = 'Terug naar de startpagina';
 $lang['Search for Author'] = 'Zoek naar maker';
-$lang['Search in Categories'] = 'Zoeken in categorieën';
+$lang['Search in albums'] = 'Zoeken in categorieën';
 $lang['Search by Date'] = 'Zoeken op datum';
 $lang['Date'] = 'Begindatum';
 $lang['End-Date'] = 'Einddatum';
@@ -277,10 +277,10 @@ $lang['Search for any terms'] = 'Zoeken naar een woord';
 $lang['Empty query. No criteria has been entered.'] = 'Lege zoekopdracht. Er is niets ingevuld.';
 $lang['Search Options'] = 'Zoekopties';
 $lang['Search results'] = 'Zoekresultaten';
-$lang['Search in subcategories'] = 'Zoeken in sub-categorieën';
+$lang['Search in sub-albums'] = 'Zoeken in sub-categorieën';
 $lang['searched words : %s'] = 'zoekwoorden : %s';
 $lang['Contact'] = 'Contact';
-$lang['set as category representative'] = 'Stel in als standaard categorie';
+$lang['set as album representative'] = 'Stel in als standaard categorie';
 $lang['Show number of comments'] = 'Toon aantal commentaren';
 $lang['Show number of hits'] = 'Toon aantal bezoekers';
 $lang['slideshow'] = 'Diavoorstelling';
@@ -320,7 +320,7 @@ $lang['User: %s'] = 'Gebruiker: %s';
 $lang['Email: %s'] = 'Email: %s';
 $lang['Admin: %s'] = 'Beheerder: %s';
 $lang['Registration of %s'] = 'Registratie van %s';
-$lang['Category: %s'] = 'Categorie: %s';
+$lang['Album: %s'] = 'Categorie: %s';
 $lang['Picture name: %s'] = 'Afbeeldingsnaam: %s';
 $lang['Creation date: %s'] = 'Aanmaakdatum: %s';
 $lang['Waiting page: %s'] = 'Wacht pagina: %s';
@@ -330,7 +330,7 @@ $lang['Bad status for user "guest", using default status. Please notify the webm
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webbeheerder en speciale gebruiker kunnen deze methode niet gebruiken';
 $lang['a user use already this mail address'] = 'Een andere gebruiker maakt al gebruik van dit email-adres';
-$lang['Category results for'] = 'Categorie resultaten voor';
+$lang['Album results for'] = 'Categorie resultaten voor';
 $lang['Tag results for'] = 'Tag resultaten voor';
 $lang['from %s to %s'] = 'van %s tot %s';
 $lang['Play of slideshow'] = 'Diavoorstelling afspelen';
diff --git a/language/pl_PL/admin.lang.php b/language/pl_PL/admin.lang.php
index bb75393d7..43bc448c4 100644
--- a/language/pl_PL/admin.lang.php
+++ b/language/pl_PL/admin.lang.php
@@ -23,14 +23,14 @@
 
 $lang['%d association'] = '%d powiązanie';
 $lang['%d associations'] = '%d powiązań';
-$lang['%d category including'] = '%d kategoria zawierająca ';
-$lang['%d categories including'] = '%d kategorii zawierających ';
+$lang['%d album including'] = '%d kategoria zawierająca ';
+$lang['%d albums including'] = '%d kategorii zawierających ';
 $lang['%d physical'] = '%d fizycznie';
 $lang['%d physical'] = '%d fizycznie';
 $lang[' and %d virtual'] = ' i %d wirtualnie';
 $lang[' and %d virtual'] = ' i %d wirtualnie';
-$lang['%d category moved'] = '%d kategoria przeniesiona';
-$lang['%d categories moved'] = '%d kategorii przeniesionych';
+$lang['%d album moved'] = '%d kategoria przeniesiona';
+$lang['%d albums moved'] = '%d kategorii przeniesionych';
 $lang['%d group'] = '%d grupa';
 $lang['%d groups'] = '%d grup';
 $lang['%d member'] = '%d członek';
@@ -597,7 +597,7 @@ $lang['overrides existing values with empty ones'] = 'nadpisuje istniejące wart
 $lang['manage image ranks'] = 'zarządzaj rankingami obrazów';
 $lang['Manage image ranks'] = 'Zarządzaj rankingami obrazów';
 $lang['Edit ranks'] = 'Edytuj rankingi';
-$lang['No element in this category'] = 'Brak elementów w tej kategorii';
+$lang['No element in this album'] = 'Brak elementów w tej kategorii';
 $lang['Images manual order was saved'] = 'Ręczne sortowanie obrazów zostało zapisane';
 $lang['ranks'] = 'rankingi';
 $lang['Drag to re-order'] = 'Przesuń aby zreorganizować';
diff --git a/language/pl_PL/common.lang.php b/language/pl_PL/common.lang.php
index 85fc63238..48d6db9b0 100644
--- a/language/pl_PL/common.lang.php
+++ b/language/pl_PL/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['code'] = 'pl';
 $lang_info['zero_plural'] = true;
 $lang['%.2f (rated %d times)'] = '%.2f (oceniane %d razy)';
 $lang['%d Kb'] = '%d Kb';
-$lang['%d category updated'] = '%d kategoria zaktualizowana';
-$lang['%d categories updated'] = '%d zaktualizowanych kategorii';
+$lang['%d album updated'] = '%d kategoria zaktualizowana';
+$lang['%d albums updated'] = '%d zaktualizowanych kategorii';
 $lang['%d comment to validate'] = '%d komentarz do weryfikacji';
 $lang['%d comments to validate'] = '%d komentarzy do weryfikacji';
 $lang['%d new comment'] = '%d nowy komentarz';
@@ -117,7 +117,7 @@ $lang['Sort by'] = 'Sortuj po';
 $lang['Sort order'] = 'Sortowanie po';
 $lang['Tag'] = 'Tag';
 $lang['Tags'] = 'Tagi';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.';
 $lang['Unknown feed identifier'] = 'Nieznany identyfikator feed';
 $lang['User comments'] = 'Komentarze użytkowników';
 $lang['Username'] = 'Użytkownik';
@@ -133,7 +133,7 @@ $lang['Adviser mode enabled'] = 'Tryb doradcy włączony';
 $lang['all'] = 'wszystkie';
 $lang['ascending'] = 'rosnąco';
 $lang['author(s) : %s'] = 'Autor(-rzy) : %s';
-$lang['Expand all categories'] = 'Rozwiń wszystkie kategorie';
+$lang['Expand all albums'] = 'Rozwiń wszystkie kategorie';
 $lang['posted after %s (%s)'] = 'umieszczone po %s (%s)';
 $lang['posted before %s (%s)'] = 'umieszczone przed %s (%s)';
 $lang['posted between %s (%s) and %s (%s)'] = 'umieszczone pomiędzy %s (%s) i %s (%s)';
@@ -189,15 +189,15 @@ $lang['Page generated in'] = 'Strona wygenerowana w';
 $lang['guest'] = 'gość';
 $lang['Hello'] = 'Witaj';
 $lang['available for administrators only'] = 'dostępne tylko dla administratorów';
-$lang['shows images at the root of this category'] = 'pokaż zdjęcia tylko dla głównej kategorii';
+$lang['shows images at the root of this album'] = 'pokaż zdjęcia tylko dla głównej kategorii';
 $lang['See last users comments'] = 'Zobacz ostatnie komentarze';
 $lang['customize the appareance of the gallery'] = 'dostosuj wyglód galerii';
 $lang['search'] = 'szukaj';
 $lang['Home'] = 'Strona Główna';
 $lang['Identification'] = 'Uprawnienia';
-$lang['in this category'] = 'w tej kategorii';
-$lang['in %d sub-category'] = 'w %d podkategori';
-$lang['in %d sub-categories'] = 'w %d podkategoriach';
+$lang['in this album'] = 'w tej kategorii';
+$lang['in %d sub-album'] = 'w %d podkategori';
+$lang['in %d sub-albums'] = 'w %d podkategoriach';
 $lang['included'] = 'zawarte';
 $lang['Invalid password!'] = 'Złe hasło!';
 $lang['Language']='Język';
@@ -211,7 +211,7 @@ $lang['Maximum height must be a number superior to 50'] = 'Maxymalna wysokość
 $lang['Maximum width of the pictures'] = 'Maxymalna szerokość zdjęć';
 $lang['Maximum width must be a number superior to 50'] = 'Maxymalna szerokość musi być liczbą do 50';
 $lang['display a calendar by creation date'] = 'wyświetla kalendarz po dacie utworzenia';
-$lang['display all elements in all sub-categories'] = 'wyświetla wszystkie elementy we wszystkich podkategoriach';
+$lang['display all elements in all sub-albums'] = 'wyświetla wszystkie elementy we wszystkich podkategoriach';
 $lang['return to normal view mode'] = 'powrót do normalnego widoku';
 $lang['display a calendar by posted date'] = 'wyświetla kalendarz po dacie umieszczenia';
 $lang['month'][10] = 'Październik';
@@ -249,8 +249,8 @@ $lang['Preferences'] = 'Preferencje';
 $lang['Previous'] = 'Poprzednia';
 $lang['Random pictures'] = 'Losowe zdjęcia';
 $lang['display a set of random pictures'] = 'wyświetla zbior losowych zdjęć';
-$lang['Recent categories'] = 'Aktualne kategorie';
-$lang['display recently updated categories'] = 'wyświetla ostatnio uaktualnione kategorie';
+$lang['Recent albums'] = 'Aktualne kategorie';
+$lang['display recently updated albums'] = 'wyświetla ostatnio uaktualnione kategorie';
 $lang['Recent period'] = 'Najnowszy okres';
 $lang['Recent pictures'] = 'Najnowsze zdjęcia';
 $lang['display most recent pictures'] = 'wyświetla najnowsze zdjęcia';
@@ -266,7 +266,7 @@ $lang['remove this tag from the list'] = 'usuń ten tag z listy';
 $lang['representative'] = 'reprezentant';
 $lang['return to homepage'] = 'powrót do strony głównej';
 $lang['Search for Author'] = 'Szukaj Autora';
-$lang['Search in Categories'] = 'Szukaj w Kategoriach';
+$lang['Search in albums'] = 'Szukaj w Kategoriach';
 $lang['Search by Date'] = 'Szukaj po Dacie';
 $lang['Date'] = 'Data od';
 $lang['End-Date'] = 'Data do';
@@ -277,10 +277,10 @@ $lang['Search for any terms'] = 'Szukaj po wszystkim';
 $lang['Empty query. No criteria has been entered.'] = 'Puste zapytanie. Nie zostały wprowadzone żadne kryteria.';
 $lang['Search Options'] = 'Opcje wyszukiwania';
 $lang['Search results'] = 'Wyniki wyszukiwania';
-$lang['Search in subcategories'] = 'Szukaj w podkategoriach';
+$lang['Search in sub-albums'] = 'Szukaj w podkategoriach';
 $lang['searched words : %s'] = 'szukane słowa : %s';
 $lang['Contact'] = 'Kontakt';
-$lang['set as category representative'] = 'ustaw jako reprezentanta kategorii';
+$lang['set as album representative'] = 'ustaw jako reprezentanta kategorii';
 $lang['Show number of comments'] = 'Pokaż liczbę komentarzy';
 $lang['Show number of hits'] = 'Pokaż liczbę wyświetleń';
 $lang['slideshow'] = 'pokaz zdjęć';
@@ -322,7 +322,7 @@ $lang['User: %s'] = 'Użytkownik: %s';
 $lang['Email: %s'] = 'Email: %s';
 $lang['Admin: %s'] = 'Admin: %s';
 $lang['Registration of %s'] = 'Rejestracja %s';
-$lang['Category: %s'] = 'Kategoria: %s';
+$lang['Album: %s'] = 'Kategoria: %s';
 $lang['Picture name: %s'] = 'Nazwa zdjęcia: %s';
 $lang['Creation date: %s'] = 'Data utworzenia: %s';
 $lang['Waiting page: %s'] = 'Strona oczekująca: %s';
@@ -332,7 +332,7 @@ $lang['Bad status for user "guest", using default status. Please notify the webm
 // --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webmaster i special user nie mogą uzywać tej metody';
 $lang['a user use already this mail address'] = 'użytkownik już używa tego adresu email';
-$lang['Category results for'] = 'Wyniki kategorii dla';
+$lang['Album results for'] = 'Wyniki kategorii dla';
 $lang['Tag results for'] = 'Wyniki tagów dla';
 $lang['from %s to %s'] = 'od %s do %s';
 $lang['Play of slideshow'] = 'Odtwórz jako slideshow';
diff --git a/language/pt_BR/admin.lang.php b/language/pt_BR/admin.lang.php
index b2ec9fc12..854740cb8 100644
--- a/language/pt_BR/admin.lang.php
+++ b/language/pt_BR/admin.lang.php
@@ -23,14 +23,14 @@
 
 $lang['%d association'] = '%d associação';
 $lang['%d associations'] = '%d associações';
-$lang['%d category including'] = '%d categoria incluída ';
-$lang['%d categories including'] = '%d categorias incluídas ';
+$lang['%d album including'] = '%d categoria incluída ';
+$lang['%d albums including'] = '%d categorias incluídas ';
 $lang['%d physical'] = '%d físico';
 $lang['%d physical'] = '%d físico';
 $lang[' and %d virtual'] = ' e %d virtual';
 $lang[' and %d virtual'] = ' e %d virtual';
-$lang['%d category moved'] = '%d categoria movida';
-$lang['%d categories moved'] = '%d categorias movidas';
+$lang['%d album moved'] = '%d categoria movida';
+$lang['%d albums moved'] = '%d categorias movidas';
 $lang['%d group'] = '%d grupo';
 $lang['%d groups'] = '%d grupos';
 $lang['%d member'] = '%d membro';
@@ -597,7 +597,7 @@ $lang['overrides existing values with empty ones'] = 'sobrepor os valores existe
 $lang['manage image ranks'] = 'gerenciar posições (image ranks)';
 $lang['Manage image ranks'] = 'Gerenciar posições (image ranks)';
 $lang['Edit ranks'] = 'Editar posições (ranks)';
-$lang['No element in this category'] = 'Nenhum item nesta categoria';
+$lang['No element in this album'] = 'Nenhum item nesta categoria';
 $lang['Images manual order was saved'] = 'A ordem manual das imagens foi salva';
 $lang['ranks'] = 'posições (ranks)';
 $lang['Drag to re-order'] = 'Arraste para reordenar';
diff --git a/language/pt_BR/common.lang.php b/language/pt_BR/common.lang.php
index 95859b19c..b5b30aafc 100644
--- a/language/pt_BR/common.lang.php
+++ b/language/pt_BR/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['zero_plural'] = false;
 
 $lang['%.2f (rated %d times)'] = '%.2f (avaliada %d vezes)';
 $lang['%d Kb'] = '%d Kb';
-$lang['%d category updated'] = '%d categoria atualizada';
-$lang['%d categories updated'] = '%d categorias atualizadas';
+$lang['%d album updated'] = '%d categoria atualizada';
+$lang['%d albums updated'] = '%d categorias atualizadas';
 $lang['%d comment to validate'] = '%d comentário para aprovar';
 $lang['%d comments to validate'] = '%d comentários para serem aprovados';
 $lang['%d new comment'] = '%d novo comentário';
@@ -117,7 +117,7 @@ $lang['Sort by'] = 'Listado por';
 $lang['Sort order'] = 'Ordem de exibição';
 $lang['Tag'] = 'Tag';
 $lang['Tags'] = 'Tags';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'O RSS notifica dos eventos da galeria : novas imagens, categorias actualizadas, Novos comentários usários. Use um leitor de fluxos RSS.';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'O RSS notifica dos eventos da galeria : novas imagens, categorias actualizadas, Novos comentários usários. Use um leitor de fluxos RSS.';
 $lang['Unknown feed identifier'] = 'identificador de fluxo RSS desconhecido';
 $lang['User comments'] = 'Comentários de usuário';
 $lang['Username'] = 'Nome de usuário';
@@ -133,7 +133,7 @@ $lang['Adviser mode enabled'] = 'Modo de aviso ativo';
 $lang['all'] = 'tudo';
 $lang['ascending'] = 'crescente';
 $lang['author(s) : %s'] = 'autor(es) : %s';
-$lang['Expand all categories'] = 'Expandir todas as categorias';
+$lang['Expand all albums'] = 'Expandir todas as categorias';
 $lang['posted after %s (%s)'] = 'disponível depois de %s (%s)';
 $lang['posted before %s (%s)'] = 'disponível antes de %s (%s)';
 $lang['posted between %s (%s) and %s (%s)'] = 'disponível entre o %s (%s) e o %s (%s)';
@@ -189,15 +189,15 @@ $lang['Page generated in'] = 'Página gerada em';
 $lang['guest'] = 'visitante';
 $lang['Hello'] = 'Olá';
 $lang['available for administrators only'] = 'disponível apenas para os administradores';
-$lang['shows images at the root of this category'] = 'mostra as imagens do diretório raíz desta categoria';
+$lang['shows images at the root of this album'] = 'mostra as imagens do diretório raíz desta categoria';
 $lang['See last users comments'] = 'Ver os últimos comentários de usuários';
 $lang['customize the appareance of the gallery'] = 'personalisar a aparência da galeria';
 $lang['search'] = 'Pesquisar';
 $lang['Home'] = 'Início';
 $lang['Identification'] = 'identificação';
-$lang['in this category'] = 'nesta categoria';
-$lang['in %d sub-category'] = 'em %d subcategoria';
-$lang['in %d sub-categories'] = 'em %d subcategorias';
+$lang['in this album'] = 'nesta categoria';
+$lang['in %d sub-album'] = 'em %d subcategoria';
+$lang['in %d sub-albums'] = 'em %d subcategorias';
 $lang['included'] = 'incluídos';
 $lang['Invalid password!'] = 'Senha inválida!';
 $lang['Language'] = 'Idioma';
@@ -211,7 +211,7 @@ $lang['Maximum height must be a number superior to 50'] = 'A altura máxima das
 $lang['Maximum width of the pictures'] = 'Largura máxima das imagens';
 $lang['Maximum width must be a number superior to 50'] = 'A largura máxima das imagens deve ser um número superior a 50';
 $lang['display a calendar by creation date'] = 'Mostra um calendário ordenado pela data de criação';
-$lang['display all elements in all sub-categories'] = 'Mostra todos os elementos em todas as subcategorias';
+$lang['display all elements in all sub-albums'] = 'Mostra todos os elementos em todas as subcategorias';
 $lang['return to normal view mode'] = 'voltar à exibição normal';
 $lang['display a calendar by posted date'] = 'Mostrar um calendário por data de envio das imagens';
 $lang['month'][10] = 'outubro';
@@ -249,8 +249,8 @@ $lang['Preferences'] = 'Preferências';
 $lang['Previous'] = 'Página anterior';
 $lang['Random pictures'] = 'Imagens aleatórias';
 $lang['display a set of random pictures'] = 'exibir um grupo aleatório de imagens';
-$lang['Recent categories'] = 'Categorias recentes';
-$lang['display recently updated categories'] = 'Exibir categorias atualizadas recentemente.';
+$lang['Recent albums'] = 'Categorias recentes';
+$lang['display recently updated albums'] = 'Exibir categorias atualizadas recentemente.';
 $lang['Recent period'] = 'Período recente';  
 $lang['Recent pictures'] = 'Imagens recentes';
 $lang['display most recent pictures'] = 'Mostrar as imagens mais recentes';
@@ -266,7 +266,7 @@ $lang['remove this tag from the list'] = 'remover esta tag da lista';
 $lang['representative'] = 'representante';
 $lang['return to homepage'] = 'voltar à página de início';
 $lang['Search for Author'] = 'Pesquisar por autor';
-$lang['Search in Categories'] = 'Pesquisar nas categorias';
+$lang['Search in albums'] = 'Pesquisar nas categorias';
 $lang['Search by Date'] = 'Pesquisar por data';
 $lang['Date'] = 'Data';
 $lang['End-Date'] = 'Data final';
@@ -277,10 +277,10 @@ $lang['Search for any terms'] = 'Pesquisar qualquer um dos termos';
 $lang['Empty query. No criteria has been entered.'] = 'Pesquisa vazia. Nenhum critério fornecido.';
 $lang['Search Options'] = 'Opções de pesquisa';
 $lang['Search results'] = 'Resultados da pesquisa';
-$lang['Search in subcategories'] = 'Pesquisar nas subcategorias';
+$lang['Search in sub-albums'] = 'Pesquisar nas subcategorias';
 $lang['searched words : %s'] = 'Palavras pesquisadas : %s';
 $lang['Contact'] = 'Contactar';
-$lang['set as category representative'] = 'Eleger para representar esta categoria';
+$lang['set as album representative'] = 'Eleger para representar esta categoria';
 $lang['Show number of comments'] = 'Exibir o número de comentários';
 $lang['Show number of hits'] = 'Exibir o número de vizualisações';
 $lang['slideshow'] = 'Slideshow';
@@ -322,7 +322,7 @@ $lang['User: %s'] = 'Usuário: %s';
 $lang['Email: %s'] = 'Email: %s';
 $lang['Admin: %s'] = 'Administração: %s';
 $lang['Registration of %s'] = 'Registro de %s';
-$lang['Category: %s'] = 'Categoria: %s';
+$lang['Album: %s'] = 'Categoria: %s';
 $lang['Picture name: %s'] = 'Nome da imagem: %s';
 $lang['Creation date: %s'] = 'Data de criação: %d';
 $lang['Waiting page: %s'] = 'Página de espera: %s';
@@ -332,7 +332,7 @@ $lang['Bad status for user "guest", using default status. Please notify the webm
 // --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrador, webmaster e utilizador especial não podem utilizar este método';
 $lang['a user use already this mail address'] = 'um outro usuário já utiliza este email';
-$lang['Category results for'] = 'Resultados da categoria para';
+$lang['Album results for'] = 'Resultados da categoria para';
 $lang['Tag results for'] = 'Resultados da tag para';
 $lang['from %s to %s'] = 'de %s ao %s';
 $lang['Play of slideshow'] = 'Iniciar o Slideshow';
diff --git a/language/pt_PT/admin.lang.php b/language/pt_PT/admin.lang.php
index 7f38e8324..f4713049a 100644
--- a/language/pt_PT/admin.lang.php
+++ b/language/pt_PT/admin.lang.php
@@ -23,14 +23,14 @@
 
 $lang['%d association'] = '%d associação';
 $lang['%d associations'] = '%d associações';
-$lang['%d category including'] = '%d categoria incluída ';
-$lang['%d categories including'] = '%d categorias incluídas ';
+$lang['%d album including'] = '%d categoria incluída ';
+$lang['%d albums including'] = '%d categorias incluídas ';
 $lang['%d physical'] = '%d físico';
 $lang['%d physical'] = '%d físico';
 $lang[' and %d virtual'] = ' e %d virtual';
 $lang[' and %d virtual'] = ' e %d virtual';
-$lang['%d category moved'] = '%d categoria movida';
-$lang['%d categories moved'] = '%d categorias movidas';
+$lang['%d album moved'] = '%d categoria movida';
+$lang['%d albums moved'] = '%d categorias movidas';
 $lang['%d group'] = '%d grupo';
 $lang['%d groups'] = '%d grupos';
 $lang['%d member'] = '%d membro';
@@ -596,7 +596,7 @@ $lang['overrides existing values with empty ones'] = 'sobrepor os valores existe
 $lang['manage image ranks'] = 'gerenciar posições (image ranks)';
 $lang['Manage image ranks'] = 'Gerenciar posições (image ranks)';
 $lang['Edit ranks'] = 'Editar posições (ranks)';
-$lang['No element in this category'] = 'Nenhum elemento nesta categoria';
+$lang['No element in this album'] = 'Nenhum elemento nesta categoria';
 $lang['Images manual order was saved'] = 'A ordem manual das imagens foi salva';
 $lang['ranks'] = 'posições (ranks)';
 $lang['Drag to re-order'] = 'Arraste para reordenar';
diff --git a/language/pt_PT/common.lang.php b/language/pt_PT/common.lang.php
index 4f37c3e85..dfae57a41 100644
--- a/language/pt_PT/common.lang.php
+++ b/language/pt_PT/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['zero_plural'] = false;
 
 $lang['%.2f (rated %d times)'] = '%.2f (avaliada %d vezes)';
 $lang['%d Kb'] = '%d Kb';
-$lang['%d category updated'] = '%d categoria atualizada';
-$lang['%d categories updated'] = '%d categorias atualizadas';
+$lang['%d album updated'] = '%d categoria atualizada';
+$lang['%d albums updated'] = '%d categorias atualizadas';
 $lang['%d comment to validate'] = '%d comentário para aprovar';
 $lang['%d comments to validate'] = '%d comentários para serem aprovados';
 $lang['%d new comment'] = '%d novo comentário';
@@ -117,7 +117,7 @@ $lang['Sort by'] = 'Listado por';
 $lang['Sort order'] = 'Ordem de exibição';
 $lang['Tag'] = 'Tag';
 $lang['Tags'] = 'Tags';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'O RSS notifica dos eventos da galeria : novas imagens, categorias actualizadas, Novos comentários usários. Use um leitor de fluxos RSS.';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'O RSS notifica dos eventos da galeria : novas imagens, categorias actualizadas, Novos comentários usários. Use um leitor de fluxos RSS.';
 $lang['Unknown feed identifier'] = 'identificador de fluxo RSS desconhecido';
 $lang['User comments'] = 'Comentários de usuário';
 $lang['Username'] = 'Nome de usuário';
@@ -133,7 +133,7 @@ $lang['Adviser mode enabled'] = 'Modo de aviso ativo';
 $lang['all'] = 'tudo';
 $lang['ascending'] = 'crescente';
 $lang['author(s) : %s'] = 'autor(es) : %s';
-$lang['Expand all categories'] = 'Expandir todas as categorias';
+$lang['Expand all albums'] = 'Expandir todas as categorias';
 $lang['posted after %s (%s)'] = 'disponível depois de %s (%s)';
 $lang['posted before %s (%s)'] = 'disponível antes de %s (%s)';
 $lang['posted between %s (%s) and %s (%s)'] = 'disponível entre o %s (%s) e o %s (%s)';
@@ -189,15 +189,15 @@ $lang['Page generated in'] = 'Página gerada em';
 $lang['guest'] = 'visitante';
 $lang['Hello'] = 'Olá';
 $lang['available for administrators only'] = 'disponível apenas para os administradores';
-$lang['shows images at the root of this category'] = 'mostra as imagens do diretório raíz desta categoria';
+$lang['shows images at the root of this album'] = 'mostra as imagens do diretório raíz desta categoria';
 $lang['See last users comments'] = 'Ver os últimos comentários de usuários';
 $lang['customize the appareance of the gallery'] = 'personalisar a aparência da galeria';
 $lang['search'] = 'Pesquisar';
 $lang['Home'] = 'Início';
 $lang['Identification'] = 'identificação';
-$lang['in this category'] = 'nesta categoria';
-$lang['in %d sub-category'] = 'em %d subcategoria';
-$lang['in %d sub-categories'] = 'em %d subcategorias';
+$lang['in this album'] = 'nesta categoria';
+$lang['in %d sub-album'] = 'em %d subcategoria';
+$lang['in %d sub-albums'] = 'em %d subcategorias';
 $lang['included'] = 'incluídos';
 $lang['Invalid password!'] = 'Palavra-passe inválida!';
 $lang['Language'] = 'Idioma';
@@ -211,7 +211,7 @@ $lang['Maximum height must be a number superior to 50'] = 'A altura máxima das
 $lang['Maximum width of the pictures'] = 'Largura máxima das imagens';
 $lang['Maximum width must be a number superior to 50'] = 'A largura máxima das imagens deve ser um número superior a 50';
 $lang['display a calendar by creation date'] = 'Mostra um calendário ordenado pela data de criação';
-$lang['display all elements in all sub-categories'] = 'Mostra todos os elementos em todas as subcategorias';
+$lang['display all elements in all sub-albums'] = 'Mostra todos os elementos em todas as subcategorias';
 $lang['return to normal view mode'] = 'voltar à exibição normal';
 $lang['display a calendar by posted date'] = 'Mostrar um calendário por data de envio das imagens';
 $lang['month'][10] = 'outubro';
@@ -249,8 +249,8 @@ $lang['Preferences'] = 'Preferências';
 $lang['Previous'] = 'Página anterior';
 $lang['Random pictures'] = 'Imagens aleatórias';
 $lang['display a set of random pictures'] = 'exibir um grupo aleatório de imagens';
-$lang['Recent categories'] = 'Categorias recentes';
-$lang['display recently updated categories'] = 'Exibir categorias atualizadas recentemente.';
+$lang['Recent albums'] = 'Categorias recentes';
+$lang['display recently updated albums'] = 'Exibir categorias atualizadas recentemente.';
 $lang['Recent period'] = 'Período recente';  
 $lang['Recent pictures'] = 'Imagens recentes';
 $lang['display most recent pictures'] = 'Mostrar as imagens mais recentes';
@@ -266,7 +266,7 @@ $lang['remove this tag from the list'] = 'remover esta tag da lista';
 $lang['representative'] = 'representante';
 $lang['return to homepage'] = 'voltar à página de início';
 $lang['Search for Author'] = 'Pesquisar por autor';
-$lang['Search in Categories'] = 'Pesquisar nas categorias';
+$lang['Search in albums'] = 'Pesquisar nas categorias';
 $lang['Search by Date'] = 'Pesquisar por data';
 $lang['Date'] = 'Data';
 $lang['End-Date'] = 'Data final';
@@ -277,10 +277,10 @@ $lang['Search for any terms'] = 'Pesquisar qualquer um dos termos';
 $lang['Empty query. No criteria has been entered.'] = 'Pesquisa vazia. Nenhum critério fornecido.';
 $lang['Search Options'] = 'Opções de pesquisa';
 $lang['Search results'] = 'Resultados da pesquisa';
-$lang['Search in subcategories'] = 'Pesquisar nas subcategorias';
+$lang['Search in sub-albums'] = 'Pesquisar nas subcategorias';
 $lang['searched words : %s'] = 'Palavras pesquisadas : %s';
 $lang['Contact'] = 'Contactar';
-$lang['set as category representative'] = 'Eleger para representar esta categoria';
+$lang['set as album representative'] = 'Eleger para representar esta categoria';
 $lang['Show number of comments'] = 'Exibir o número de comentários';
 $lang['Show number of hits'] = 'Exibir o número de vizualisações';
 $lang['slideshow'] = 'Slideshow';
@@ -322,7 +322,7 @@ $lang['User: %s'] = 'Usuário: %s';
 $lang['Email: %s'] = 'Email: %s';
 $lang['Admin: %s'] = 'Administração: %s';
 $lang['Registration of %s'] = 'Registro de %s';
-$lang['Category: %s'] = 'Categoria: %s';
+$lang['Album: %s'] = 'Categoria: %s';
 $lang['Picture name: %s'] = 'Nome da imagem: %s';
 $lang['Creation date: %s'] = 'Data de criação: %d';
 $lang['Waiting page: %s'] = 'Página de espera: %s';
@@ -332,7 +332,7 @@ $lang['Bad status for user "guest", using default status. Please notify the webm
 // --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrador, webmaster e utilizador especial não podem utilizar este método';
 $lang['a user use already this mail address'] = 'um outro usuário já utiliza este email';
-$lang['Category results for'] = 'Resultados da categoria para';
+$lang['Album results for'] = 'Resultados da categoria para';
 $lang['Tag results for'] = 'Resultados da tag para';
 $lang['from %s to %s'] = 'de %s ao %s';
 $lang['Play of slideshow'] = 'Iniciar o Slideshow';
diff --git a/language/ro_RO/common.lang.php b/language/ro_RO/common.lang.php
index af5eaba13..d6a45edca 100644
--- a/language/ro_RO/common.lang.php
+++ b/language/ro_RO/common.lang.php
@@ -33,8 +33,8 @@ $lang_info['code'] = 'ro';
 $lang_info['zero_plural'] = true;
 
 $lang['%d Kb'] = '%d Kb';
-$lang['%d category updated'] = '%d categorie actualizată';
-$lang['%d categories updated'] = '%d categorii actualizate';
+$lang['%d album updated'] = '%d categorie actualizată';
+$lang['%d albums updated'] = '%d categorii actualizate';
 $lang['%d comment to validate'] = '%d comentariu de validat';
 $lang['%d comments to validate'] = '%d comentarii de validat';
 $lang['%d new comment'] = '%d nou comentariu';
@@ -119,7 +119,7 @@ $lang['Sort by'] = 'Sortare după';
 $lang['Sort order'] = 'Ordine de sortare';
 $lang['Tag'] = 'Etichetă';
 $lang['Tags'] = 'Etichete';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'Notificarea RSS feed prevede notificarea cu privire la noutăţile din acest site: poze noi, categorii actualizate, noi comentarii. Folosiţi un RSS feed reader.';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'Notificarea RSS feed prevede notificarea cu privire la noutăţile din acest site: poze noi, categorii actualizate, noi comentarii. Folosiţi un RSS feed reader.';
 $lang['Unknown feed identifier'] = 'Identificator RSS feed  necunoscut';
 $lang['User comments'] = 'Comentarii utilizator ';
 $lang['Username'] = 'Nume de utilizator';
@@ -135,7 +135,7 @@ $lang['Adviser mode enabled'] = 'Mod de consilier activat';
 $lang['all'] = 'tot';
 $lang['ascending'] = 'ascendent';
 $lang['author(s) : %s'] = 'autor(i) : %s';
-$lang['Expand all categories'] = 'Extinde toate categoriile';
+$lang['Expand all albums'] = 'Extinde toate categoriile';
 $lang['posted after %s (%s)'] = 'postat după %s (%s)';
 $lang['posted before %s (%s)'] = 'postat înainte de %s (%s)';
 $lang['posted between %s (%s) and %s (%s)'] = 'postat între %s (%s) şi %s (%s)';
@@ -192,14 +192,14 @@ $lang['Page generated in'] = 'Pagina generată în';
 $lang['guest'] = 'vizitator';
 $lang['Hello'] = 'Bună ziua';
 $lang['available for administrators only'] = 'disponibil numai pentru administratori';
-$lang['shows images at the root of this category'] = 'prezintă imagini de la rădăcina acestei categorii';
+$lang['shows images at the root of this album'] = 'prezintă imagini de la rădăcina acestei categorii';
 $lang['See last users comments'] = 'Vezi cele mai recente comentarii ale utilizatorilor';
 $lang['customize the appareance of the gallery'] = 'personalizează aspectul galeriei';
 $lang['search'] = 'căutare';
 $lang['Home'] = 'Prima pagină';
-$lang['in this category'] = 'în această categorie';
-$lang['in %d sub-category'] = 'în %d sub-categorie';
-$lang['in %d sub-categories'] = 'în %d sub-categorii';
+$lang['in this album'] = 'în această categorie';
+$lang['in %d sub-album'] = 'în %d sub-categorie';
+$lang['in %d sub-albums'] = 'în %d sub-categorii';
 $lang['included'] = 'inclus';
 $lang['Invalid password!'] = 'Parolă invalidă !';
 $lang['Language'] = 'Limbă';
@@ -213,7 +213,7 @@ $lang['Maximum height must be a number superior to 50'] = 'Înălţimea maximă
 $lang['Maximum width of the pictures'] = 'Lăţimea maximă a imaginilor';
 $lang['Maximum width must be a number superior to 50'] = 'Lăţimea maximă trebuie să fie mai mare de 50';
 $lang['display a calendar by creation date'] = 'afişează un calendar în funcţie de data creării';
-$lang['display all elements in all sub-categories'] = 'afişează toate elementele în toate sub-categoriile';
+$lang['display all elements in all sub-albums'] = 'afişează toate elementele în toate sub-categoriile';
 $lang['return to normal view mode'] = 'Înapoi la vizualizarea normală';
 $lang['display a calendar by posted date'] = 'afişează un calendar în funcţie de data adăugării';
 $lang['Most visited'] = 'Cele mai vizionate';
@@ -238,9 +238,9 @@ $lang['Powered by'] = 'Realizat de';
 $lang['Preferences'] = 'Preferinţe';
 $lang['Random pictures'] = 'Imagini aleatoare';
 $lang['display a set of random pictures'] = 'afişează un set de imagini aleatoare';
-$lang['Recent categories'] = 'Categorii recente';
-$lang['Recent categories'] = 'Categorii recente';
-$lang['display recently updated categories'] = 'afişează categoriile create  sau actualizate recent ';
+$lang['Recent albums'] = 'Categorii recente';
+$lang['Recent albums'] = 'Categorii recente';
+$lang['display recently updated albums'] = 'afişează categoriile create  sau actualizate recent ';
 $lang['Recent period'] = 'Recent';
 $lang['Recent pictures'] = 'Imagini recente';
 $lang['display most recent pictures'] = 'afişează cele mai recente imagini';
@@ -256,7 +256,7 @@ $lang['remove this tag from the list'] = 'eliminaţi acesta etichetă de pe list
 $lang['representative'] = 'reprezentant';
 $lang['return to homepage'] = 'reveniţi la prima pagină';
 $lang['Search for Author'] = 'Caută autor';
-$lang['Search in Categories'] = 'Caută în categorii';
+$lang['Search in albums'] = 'Caută în categorii';
 $lang['Previous'] = 'Precedent(e)';
 $lang['Search by Date'] = 'Căutare după dată';
 $lang['Date'] = 'Dată';
@@ -268,10 +268,10 @@ $lang['Search for any terms'] = 'Cauta după oricare dintre termeni';
 $lang['Empty query. No criteria has been entered.'] = 'Interogare goală. Nici un criteriu nu a fost introdus.';
 $lang['Search Options'] = 'Opţiuni de căutare';
 $lang['Search results'] = 'Rezultatele căutării';
-$lang['Search in subcategories'] = 'Caută în sub-categorii';
+$lang['Search in sub-albums'] = 'Caută în sub-categorii';
 $lang['searched words : %s'] = 'cuvinte căutate : %s';
 $lang['Contact'] = 'Contact';
-$lang['set as category representative'] = 'Setaţi ca reprezentant al acestei categorii';
+$lang['set as album representative'] = 'Setaţi ca reprezentant al acestei categorii';
 $lang['Show number of comments'] = 'Arată numărul de comentarii';
 $lang['Show number of hits'] = 'Arată numărul de vizualizări';
 $lang['slideshow'] = 'prezentare';
@@ -312,7 +312,7 @@ $lang['User: %s'] = 'Utilizator: %s';
 $lang['Email: %s'] = 'E-mail : %s';
 $lang['Admin: %s'] = 'Administraţie : %s';
 $lang['Registration of %s'] = 'Înregistrare de %s';
-$lang['Category: %s'] = 'Categorie : %s';
+$lang['Album: %s'] = 'Categorie : %s';
 $lang['Picture name: %s'] = 'Numele imaginii : %s';
 $lang['Creation date: %s'] = 'Data creării : %d';
 $lang['Waiting page: %s'] = 'Pagina de aşteptare : %s';
@@ -320,7 +320,7 @@ $lang['Picture uploaded by %s'] = 'Imagine adăugată de %s';
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Statutul utilizatorului "invitat" este eronat, se vor folosi  parametrii impliciţi. Va rugăm sa informaţi webmasterul.';
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administratorul, webmasterul şi utilizatorul special nu pot folosi aceasta metodă';
 $lang['a user use already this mail address'] = 'un alt utilizator foloseşte deja acest e-mail';
-$lang['Category results for'] = 'Rezultatele categoriilor pentru';
+$lang['Album results for'] = 'Rezultatele categoriilor pentru';
 $lang['Tag results for'] = 'Rezultatele  etichetelor pentru';
 $lang['from %s to %s'] = 'de la %s până la %s';
 $lang['Play of slideshow'] = 'Startează prezentarea';
diff --git a/language/ru_RU/admin.lang.php b/language/ru_RU/admin.lang.php
index e0a96d6e1..75018b0ee 100644
--- a/language/ru_RU/admin.lang.php
+++ b/language/ru_RU/admin.lang.php
@@ -23,14 +23,14 @@
 
 $lang['%d association'] = '%d связь';
 $lang['%d associations'] = '%d связей';
-$lang['%d category including'] = '%d категория добавлена ';
-$lang['%d categories including'] = 'категорий добавлено: %d';
+$lang['%d album including'] = '%d категория добавлена ';
+$lang['%d albums including'] = 'категорий добавлено: %d';
 $lang['%d physical'] = '%d реальная';
 $lang['%d physical'] = '%d реальных';
 $lang[' and %d virtual'] = ' и %d виртуальная';
 $lang[' and %d virtual'] = ' и %d виртуальных';
-$lang['%d category moved'] = '%d категория перемещена';
-$lang['%d categories moved'] = '%d категорий перемещено';
+$lang['%d album moved'] = '%d категория перемещена';
+$lang['%d albums moved'] = '%d категорий перемещено';
 $lang['%d group'] = '%d группа';
 $lang['%d groups'] = '%d групп';
 $lang['%d member'] = '%d участник';
@@ -595,7 +595,7 @@ $lang['overrides existing values with empty ones'] = 'замена сущест�
 $lang['manage image ranks'] = 'управление порядком изображений';
 $lang['Manage image ranks'] = 'Управление порядком изображений';
 $lang['Edit ranks'] = 'Изменить порядок';
-$lang['No element in this category'] = 'Пустая категория';
+$lang['No element in this album'] = 'Пустая категория';
 $lang['Images manual order was saved'] = 'Указанный порядок изображений сохранен';
 $lang['ranks'] = 'порядок';
 $lang['Drag to re-order'] = 'Перетащите чтобы изменить порядок';
diff --git a/language/ru_RU/common.lang.php b/language/ru_RU/common.lang.php
index 697c3b7d3..10018ca24 100644
--- a/language/ru_RU/common.lang.php
+++ b/language/ru_RU/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['zero_plural'] = true;
 
 $lang['%.2f (rated %d times)'] = '%.2f (%d оценок)';
 $lang['%d Kb'] = '%d Kb';
-$lang['%d category updated'] = '%d категория дополнена';
-$lang['%d categories updated'] = 'категорий дополнено: %d';
+$lang['%d album updated'] = '%d категория дополнена';
+$lang['%d albums updated'] = 'категорий дополнено: %d';
 $lang['%d comment to validate'] = '%d комментарий на проверке';
 $lang['%d comments to validate'] = 'комментариев на проверке: %d';
 $lang['%d new comment'] = '%d новый комментарий';
@@ -117,7 +117,7 @@ $lang['Sort by'] = 'Признак сортировки';
 $lang['Sort order'] = 'Порядок сортировки';
 $lang['Tag'] = 'Слово';
 $lang['Tags'] = 'Ключевые слова';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'Уведомления RSS рассказывают о новом на этом сайте: новых фотографиях, обновленных галереях, новых комментариях. Для этого пользуйтесь RSS-читалкой.';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'Уведомления RSS рассказывают о новом на этом сайте: новых фотографиях, обновленных галереях, новых комментариях. Для этого пользуйтесь RSS-читалкой.';
 $lang['Unknown feed identifier'] = 'Неизвестный идентификатор ленты';
 $lang['User comments'] = 'Комментарии посетителей';
 $lang['Username'] = 'Имя пользователя';
@@ -133,7 +133,7 @@ $lang['Adviser mode enabled'] = 'Включить подсказки';
 $lang['all'] = 'все';
 $lang['ascending'] = 'по возрастанию';
 $lang['author(s) : %s'] = 'автор(ы) : %s';
-$lang['Expand all categories'] = 'Раскрыть все категории';
+$lang['Expand all albums'] = 'Раскрыть все категории';
 $lang['posted after %s (%s)'] = 'опубликовано после %s (%s)';
 $lang['posted before %s (%s)'] = 'опубликовано до %s (%s)';
 $lang['posted between %s (%s) and %s (%s)'] = 'опубликовано между %s (%s) и %s (%s)';
@@ -189,15 +189,15 @@ $lang['Page generated in'] = 'Страница сгенерирована за';
 $lang['guest'] = 'гость';
 $lang['Hello'] = 'Привет';
 $lang['available for administrators only'] = 'доступно только для администратора';
-$lang['shows images at the root of this category'] = 'показать фотографии из корня категории';
+$lang['shows images at the root of this album'] = 'показать фотографии из корня категории';
 $lang['See last users comments'] = 'Просмотр последних пользовательский комментариев';
 $lang['customize the appareance of the gallery'] = 'настройка оформления';
 $lang['search'] = 'поиск';
 $lang['Home'] = 'Начало';
 $lang['Identification'] = 'Вход';
-$lang['in this category'] = 'в этой категории';
-$lang['in %d sub-category'] = 'в %d подкатегории';
-$lang['in %d sub-categories'] = '(в %d подкатегориях)';
+$lang['in this album'] = 'в этой категории';
+$lang['in %d sub-album'] = 'в %d подкатегории';
+$lang['in %d sub-albums'] = '(в %d подкатегориях)';
 $lang['included'] = 'включено';
 $lang['Invalid password!'] = 'Неверный пароль!';
 $lang['Language']='Язык';
@@ -211,7 +211,7 @@ $lang['Maximum height must be a number superior to 50'] = 'Максимальн�
 $lang['Maximum width of the pictures'] = 'Максимальная ширина изображения';
 $lang['Maximum width must be a number superior to 50'] = 'Максимальная ширина изображения должна быть больше 50';
 $lang['display a calendar by creation date'] = 'показывает календарь по дате создания';
-$lang['display all elements in all sub-categories'] = 'показывает все фотографии во всех подкатегориях';
+$lang['display all elements in all sub-albums'] = 'показывает все фотографии во всех подкатегориях';
 $lang['return to normal view mode'] = 'возвращение к нормальному режиму';
 $lang['display a calendar by posted date'] = 'показывает календарь по дате отправления';
 $lang['month'][10] = 'Октябрь';
@@ -249,8 +249,8 @@ $lang['Preferences'] = 'Предпочтение';
 $lang['Previous'] = 'Предыдущая';
 $lang['Random pictures'] = 'Случайные';
 $lang['display a set of random pictures'] = 'несколько случайных фотографий';
-$lang['Recent categories'] = 'Новые галереи';
-$lang['display recently updated categories'] = 'показать обновленные галереи';
+$lang['Recent albums'] = 'Новые галереи';
+$lang['display recently updated albums'] = 'показать обновленные галереи';
 $lang['Recent period'] = 'Срок "новых"';
 $lang['Recent pictures'] = 'Новые фотографии';
 $lang['display most recent pictures'] = 'показывает новые фотографии';
@@ -266,7 +266,7 @@ $lang['remove this tag from the list'] = 'удалить этот тэг из с
 $lang['representative'] = 'представитель';
 $lang['return to homepage'] = 'вернуться на главную';
 $lang['Search for Author'] = 'Поиск по автору';
-$lang['Search in Categories'] = 'Поиск в Категориях';
+$lang['Search in albums'] = 'Поиск в Категориях';
 $lang['Search by Date'] = 'Поиск по дате';
 $lang['Date'] = 'Начальная дата';
 $lang['End-Date'] = 'Конечная дата';
@@ -277,10 +277,10 @@ $lang['Search for any terms'] = 'Поиск по любому критерию';
 $lang['Empty query. No criteria has been entered.'] = 'Пустой запрос. Нет критериев для поиска.';
 $lang['Search Options'] = 'Варианты поиска';
 $lang['Search results'] = 'Результаты поиска';
-$lang['Search in subcategories'] = 'и в подкатегориях';
+$lang['Search in sub-albums'] = 'и в подкатегориях';
 $lang['searched words : %s'] = 'искомые слова: %s';
 $lang['Contact'] = 'Контакты';
-$lang['set as category representative'] = 'сделать представителем категории';
+$lang['set as album representative'] = 'сделать представителем категории';
 $lang['Show number of comments'] = 'Показывать количество комментариев';
 $lang['Show number of hits'] = 'Показывать количество просмотров';
 $lang['slideshow'] = 'слайдшоу';
@@ -322,7 +322,7 @@ $lang['User: %s'] = 'Посетитель: %s';
 $lang['Email: %s'] = 'адрес: %s';
 $lang['Admin: %s'] = 'Администратор: %s';
 $lang['Registration of %s'] = 'Регистрация %s';
-$lang['Category: %s'] = 'Категория: %s';
+$lang['Album: %s'] = 'Категория: %s';
 $lang['Picture name: %s'] = 'Название: %s';
 $lang['Creation date: %s'] = 'Дата съемки: %s';
 $lang['Waiting page: %s'] = 'Страница ожидания: %s';
@@ -332,7 +332,7 @@ $lang['Bad status for user "guest", using default status. Please notify the webm
 // --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webmaster and special user cannot use this method';
 $lang['a user use already this mail address'] = 'пользователь с таким адресом уже есть';
-$lang['Category results for'] = 'Результат категорий для';
+$lang['Album results for'] = 'Результат категорий для';
 $lang['Tag results for'] = 'Слова-результаты для';
 $lang['from %s to %s'] = 'от %s до %s';
 $lang['Play of slideshow'] = 'Показать слайдшоу';
diff --git a/language/sr_RS/admin.lang.php b/language/sr_RS/admin.lang.php
index a479e4f6e..fb0adce73 100644
--- a/language/sr_RS/admin.lang.php
+++ b/language/sr_RS/admin.lang.php
@@ -23,14 +23,14 @@
 
 $lang['%d association'] = '%d veza';
 $lang['%d associations'] = '%d veze';
-$lang['%d category including'] = '%d kategorija obuhvata ';
-$lang['%d categories including'] = '%d kategorije obuhvataju ';
+$lang['%d album including'] = '%d kategorija obuhvata ';
+$lang['%d albums including'] = '%d kategorije obuhvataju ';
 $lang['%d physical'] = '%d stvarna';
 $lang['%d physical'] = '%d stvarnih';
 $lang[' and %d virtual'] = ' i %d virtualna';
 $lang[' and %d virtual'] = ' i %d virtualnih';
-$lang['%d category moved'] = '%d kategorija premeštena';
-$lang['%d categories moved'] = '%d kategorija premešteno';
+$lang['%d album moved'] = '%d kategorija premeštena';
+$lang['%d albums moved'] = '%d kategorija premešteno';
 $lang['%d group'] = '%d grupa';
 $lang['%d groups'] = '%d grupa';
 $lang['%d member'] = '%d član';
@@ -598,7 +598,7 @@ $lang['overrides existing values with empty ones'] = 'prekucava postojeće vredn
 $lang['manage image ranks'] = 'upravljanje poretkom slika';
 $lang['Manage image ranks'] = 'Upravljanje poretkom';
 $lang['Edit ranks'] = 'Uredi poredak';
-$lang['No element in this category'] = 'Nema elemenata u ovoj kategoriji';
+$lang['No element in this album'] = 'Nema elemenata u ovoj kategoriji';
 $lang['Images manual order was saved'] = 'Sačuvan je podešenii redosled slika';
 $lang['ranks'] = 'poredak';
 $lang['Drag to re-order'] = 'Povuci za preređivanje';
diff --git a/language/sr_RS/common.lang.php b/language/sr_RS/common.lang.php
index f999797dc..e5e7de147 100644
--- a/language/sr_RS/common.lang.php
+++ b/language/sr_RS/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['zero_plural'] = true;
 
 $lang['%.2f (rated %d times)'] = '%.2f (ocenjeno %d puta)';
 $lang['%d Kb'] = '%d Kb';
-$lang['%d category updated'] = '%d kategorija obnovljena';
-$lang['%d categories updated'] = '%d kategorije obnovljene';
+$lang['%d album updated'] = '%d kategorija obnovljena';
+$lang['%d albums updated'] = '%d kategorije obnovljene';
 $lang['%d comment to validate'] = '%d komentar za overu';
 $lang['%d comments to validate'] = '%d komentari za overu';
 $lang['%d new comment'] = '%d novi komentar';
@@ -117,7 +117,7 @@ $lang['Sort by'] = 'Složeno po';
 $lang['Sort order'] = 'Redosled slaganja';
 $lang['Tag'] = 'Oznaka';
 $lang['Tags'] = 'Tagovi';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'RSS obavijesni izvor omogućava obaveštavanje o novostima sa ovog web mesta : nove slike, obnovljene kategorije, nove komentare. Koristite čitač RSS izvora.';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'RSS obavijesni izvor omogućava obaveštavanje o novostima sa ovog web mesta : nove slike, obnovljene kategorije, nove komentare. Koristite čitač RSS izvora.';
 $lang['Unknown feed identifier'] = 'Nepoznata oznaka izvora';
 $lang['User comments'] = 'Korisnički komentari';
 $lang['Username'] = 'Korisničko ime';
@@ -133,7 +133,7 @@ $lang['Adviser mode enabled'] = 'Savetnički mod omogućen';
 $lang['all'] = 'sve';
 $lang['ascending'] = 'uzlazno';
 $lang['author(s) : %s'] = 'autor(i) : %s';
-$lang['Expand all categories'] = 'Proširi sve kategorije';
+$lang['Expand all albums'] = 'Proširi sve kategorije';
 $lang['posted after %s (%s)'] = 'objavljeno posle %s (%s)';
 $lang['posted before %s (%s)'] = 'objavljeno pre %s (%s)';
 $lang['posted between %s (%s) and %s (%s)'] = 'objavljeno između %s (%s) i %s (%s)';
@@ -189,15 +189,15 @@ $lang['Page generated in'] = 'Stranica izrađena u ';
 $lang['guest'] = 'gost';
 $lang['Hello'] = 'Pozdrav';
 $lang['available for administrators only'] = 'dostupno samo administratorima';
-$lang['shows images at the root of this category'] = 'prikazuje slike u glavnoj kategoriji';
+$lang['shows images at the root of this album'] = 'prikazuje slike u glavnoj kategoriji';
 $lang['See last users comments'] = 'Pregled zadnjih korisničkih komentara';
 $lang['customize the appareance of the gallery'] = 'podesite izgled vaše galerije';
 $lang['search'] = 'pretraži';
 $lang['Home'] = 'Početna';
 $lang['Identification'] = 'Prijava';
-$lang['in this category'] = 'u ovoj kategoriji';
-$lang['in %d sub-category'] = 'u %d podkategoriji';
-$lang['in %d sub-categories'] = 'u %d podkategorijama';
+$lang['in this album'] = 'u ovoj kategoriji';
+$lang['in %d sub-album'] = 'u %d podkategoriji';
+$lang['in %d sub-albums'] = 'u %d podkategorijama';
 $lang['included'] = 'uključeno';
 $lang['Invalid password!'] = 'Pogrešna lozinka!';
 $lang['Language']='Jezik';
@@ -211,7 +211,7 @@ $lang['Maximum height must be a number superior to 50'] = 'Najveća visina mora
 $lang['Maximum width of the pictures'] = 'Najveća dozvoljena širina slika';
 $lang['Maximum width must be a number superior to 50'] = 'Najveća širina mora biti broj veći od 50';
 $lang['display a calendar by creation date'] = 'prikaz kalendara po datumu izrade';
-$lang['display all elements in all sub-categories'] = 'prikaz svih stavki u svim podkategorijama';
+$lang['display all elements in all sub-albums'] = 'prikaz svih stavki u svim podkategorijama';
 $lang['return to normal view mode'] = 'povratak u uobičajeni način pregleda';
 $lang['display a calendar by posted date'] = 'prikaz kalendara po datumu objave';
 $lang['month'][10] = 'Oktobar';
@@ -249,8 +249,8 @@ $lang['Preferences'] = 'Podešenja';
 $lang['Previous'] = 'Prethodni';
 $lang['Random pictures'] = 'Slike po slučajnom izboru';
 $lang['display a set of random pictures'] = 'prikaz slika po slučajnom izboru';
-$lang['Recent categories'] = 'Nedavne kategorije';
-$lang['display recently updated categories'] = 'prikaz nedavno obnovljenih kategorija';
+$lang['Recent albums'] = 'Nedavne kategorije';
+$lang['display recently updated albums'] = 'prikaz nedavno obnovljenih kategorija';
 $lang['Recent period'] = 'Nedavno razdoblje';
 $lang['Recent pictures'] = 'Nedavne slike';
 $lang['display most recent pictures'] = 'prikaz najnovijih slika';
@@ -266,7 +266,7 @@ $lang['remove this tag from the list'] = 'ukloni  ovaj tag iz popisa';
 $lang['representative'] = 'predstavnik';
 $lang['return to homepage'] = 'povratak na početnu';
 $lang['Search for Author'] = 'Pretraživanje po Autoru';
-$lang['Search in Categories'] = 'Pretraživanje u Kategorijama';
+$lang['Search in albums'] = 'Pretraživanje u Kategorijama';
 $lang['Search by Date'] = 'Pretraživanje po Datumu';
 $lang['Date'] = 'Datum';
 $lang['End-Date'] = 'Krajnji Datum';
@@ -277,10 +277,10 @@ $lang['Search for any terms'] = 'Pretraživanje po bilo kojem kriterijumu';
 $lang['Empty query. No criteria has been entered.'] = 'Prazna pretraga. Nije unešeno ni jedno polje.';
 $lang['Search Options'] = 'Mogućnosti Pretraživanja';
 $lang['Search results'] = 'Rezultati pretraživanja';
-$lang['Search in subcategories'] = 'Pretraživanje u podkategorijama';
+$lang['Search in sub-albums'] = 'Pretraživanje u podkategorijama';
 $lang['searched words : %s'] = 'tražene reči : %s';
 $lang['Contact'] = 'Kontakt';
-$lang['set as category representative'] = 'postavi za predstavnika kategorije';
+$lang['set as album representative'] = 'postavi za predstavnika kategorije';
 $lang['Show number of comments'] = 'Prikaži broj komentara';
 $lang['Show number of hits'] = 'Prikaži broj poseta';
 $lang['slideshow'] = 'klizni prikaz';
@@ -322,7 +322,7 @@ $lang['User: %s'] = 'Korisnik: %s';
 $lang['Email: %s'] = 'E-mail: %s';
 $lang['Admin: %s'] = 'Administrator: %s';
 $lang['Registration of %s'] = 'Prijava od %s';
-$lang['Category: %s'] = 'Kategorija: %s';
+$lang['Album: %s'] = 'Kategorija: %s';
 $lang['Picture name: %s'] = 'Naziv slike: %s';
 $lang['Creation date: %s'] = 'Datum izrade: %s';
 $lang['Waiting page: %s'] = 'Stranica čekanja: %s';
@@ -332,7 +332,7 @@ $lang['Bad status for user "guest", using default status. Please notify the webm
 // --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webmaster i posebni korisnik ne mogu koristiti ovu metodu';
 $lang['a user use already this mail address'] = 'korisnik već koristi ovu e-mail adresu';
-$lang['Category results for'] = 'Rezultati kategorije za ';
+$lang['Album results for'] = 'Rezultati kategorije za ';
 $lang['Tag results for'] = 'Rezultati tagova za';
 $lang['from %s to %s'] = 'od %s do %s';
 $lang['Play of slideshow'] = 'Pokreni klizni prikaz';
diff --git a/language/tr_TR/common.lang.php b/language/tr_TR/common.lang.php
index f999227b5..c1a78a71d 100644
--- a/language/tr_TR/common.lang.php
+++ b/language/tr_TR/common.lang.php
@@ -29,8 +29,8 @@ $lang_info['code'] = 'tr';
 $lang_info['zero_plural'] = true;
 
 $lang['%d Kb'] = '%d Kilobayt';
-$lang['%d category updated'] = '%d Kategori Güncellendi';
-$lang['%d categories updated'] = '%d Kategoriler Güncellendi';
+$lang['%d album updated'] = '%d Kategori Güncellendi';
+$lang['%d albums updated'] = '%d Kategoriler Güncellendi';
 $lang['%d comment to validate'] = '%d Doğrulanacak yorum';
 $lang['%d comments to validate'] = '%d Doğrulanacak yorumlar ';
 $lang['%d new comment'] = '%d Yeni Yorum';
@@ -115,7 +115,7 @@ $lang['Sort by'] = 'Sırala';
 $lang['Sort order'] = 'Sıralama Düzeni';
 $lang['Tag'] = 'Etiket';
 $lang['Tags'] = 'Etiketler';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'RSS beslemeleri bu site üzerinden gelen haberleri kolay bir şekilde okumanızı sağlar.';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'RSS beslemeleri bu site üzerinden gelen haberleri kolay bir şekilde okumanızı sağlar.';
 $lang['Unknown feed identifier'] = 'Bilinmeyen besleme kimliği';
 $lang['User comments'] = 'Ziyaretçi Yorumları';
 $lang['Username'] = 'Kullanıcı Adı';
@@ -131,7 +131,7 @@ $lang['Adviser mode enabled'] = 'Danışman Modu Aktif';
 $lang['all'] = 'Hepsi';
 $lang['ascending'] = 'Artan';
 $lang['author(s) : %s'] = 'Yazar(lar) : %s';
-$lang['Expand all categories'] = 'Tüm kategorileri genişlet';
+$lang['Expand all albums'] = 'Tüm kategorileri genişlet';
 $lang['posted after %s (%s)'] = 'Şundan sonra gönderildi %s (%s)';
 $lang['posted before %s (%s)'] = 'Şundan önce gönderildi %s (%s)';
 $lang['posted between %s (%s) and %s (%s)'] = 'Şununla birlikte gönderildi %s (%s) ve %s (%s)';
@@ -188,15 +188,15 @@ $lang['Page generated in'] = 'Sayfa oluşturulma';
 $lang['guest'] = 'Misafir';
 $lang['Hello'] = 'Merhaba';
 $lang['available for administrators only'] = 'Yöneticilere Özel';
-$lang['shows images at the root of this category'] = 'Bu kategori anasayfası';
+$lang['shows images at the root of this album'] = 'Bu kategori anasayfası';
 $lang['See last users comments'] = 'Son Yorumları Gör';
 $lang['customize the apperance of the gallery'] = 'Galeri görünümünü düzenle';
 $lang['search'] = 'Arama';
 $lang['Home'] = 'Anasayfa';
 $lang['Identification'] = 'Kimlik';
-$lang['in this category'] = 'Bu kategoride';
-$lang['in %d sub-category'] = '%d tane alt kategori';
-$lang['in %d sub-categories'] = '%d tane alt kategori';
+$lang['in this album'] = 'Bu kategoride';
+$lang['in %d sub-album'] = '%d tane alt kategori';
+$lang['in %d sub-albums'] = '%d tane alt kategori';
 $lang['included'] = 'dahili';
 $lang['Invalid password!'] = 'Yanlış Parola!';
 $lang['Language']='Dil';
@@ -216,7 +216,7 @@ $lang['Quick search'] = 'Hızlı arama';
 $lang['Connected user: %s'] = 'Kullanıcıya bağlanılıyor: %s';
 $lang['IP: %s'] = 'IP: %s';
 $lang['Browser: %s'] = 'Web Tarayıcı: %s';
-$lang['display all elements in all sub-categories'] = 'Tüm kategorilerdeki ve alt kategorilerdeki içeriği göster';
+$lang['display all elements in all sub-albums'] = 'Tüm kategorilerdeki ve alt kategorilerdeki içeriği göster';
 $lang['return to normal view mode'] = 'normal görüntü moduna geri dön';
 $lang['display a calendar by posted date'] = 'gönderme gününü takvimde göster';
 $lang['month'][10] = "Ekim";
@@ -254,8 +254,8 @@ $lang['Preferences'] = 'özellikler';
 $lang['Previous'] = 'önceki';
 $lang['Random pictures'] = 'Karışık resimler';
 $lang['display a set of random pictures'] = 'rastgele birkaç resim göster';
-$lang['Recent categories'] = 'Son eklenen kategoriler';
-$lang['display recently updated categories'] = 'yakın zamanda eklenen kategorileri göster';
+$lang['Recent albums'] = 'Son eklenen kategoriler';
+$lang['display recently updated albums'] = 'yakın zamanda eklenen kategorileri göster';
 $lang['Recent period'] = 'yakın dönem';
 $lang['Recent pictures'] = 'Son eklenen resimler';
 $lang['display most recent pictures'] = 'en son eklenen resimleri göster';
@@ -276,7 +276,7 @@ $lang['User: %s'] = 'Kullanıcı: %s';
 $lang['Email: %s'] = 'E-Posta: %s';
 $lang['Admin: %s'] = 'Yönetici: %s';
 $lang['Registration of %s'] = 'Tescil Eden: %s';
-$lang['Category: %s'] = 'Kategori: %s';
+$lang['Album: %s'] = 'Kategori: %s';
 $lang['Picture name: %s'] = 'resim Adı: %s';
 $lang['Creation date: %s'] = 'Yaratma Tarihi: %s';
 $lang['Waiting page: %s'] = 'Beklenen Sayfa: %s';
@@ -284,7 +284,7 @@ $lang['Picture uploaded by %s'] = 'resimi Gönderen %s';
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Kullanıcı için kötü statü "ziyaretçi", varsayılan statü kullanılıyor. Lütfen webmaster\'a bildirin';
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Yönetici, webmaster ve özel kullanıcı bu metodu kullanamaz';
 $lang['a user use already this mail address'] = 'bu e-posta adresi başka bir kullanıcı tarafından kullanılmaktadır.';
-$lang['Category results for'] = 'kategori sonuçları';
+$lang['Album results for'] = 'kategori sonuçları';
 $lang['Tag results for'] = 'işaretleme sonuçları';
 $lang['from %s to %s'] = 'şundan %s buna %s';
 $lang['Play of slideshow'] = 'slayt gösterisini başlat';
@@ -332,7 +332,7 @@ $lang['delete this comment'] = 'yorumu sil';
 $lang['validate this comment'] = 'yorumu onayla';
 $lang['return to homepage'] = 'ana sayfaya dönüş';
 $lang['Search for Author'] = 'yayımcı kullanıcı adıyla ara';
-$lang['Search in Categories'] = 'Kategorilerde ara';
+$lang['Search in albums'] = 'Kategorilerde ara';
 $lang['Search by Date'] = 'tarihe göre ara';
 $lang['Date'] = 'tarih';
 $lang['End-Date'] = 'tarih sonu';
@@ -343,7 +343,7 @@ $lang['Search for any terms'] = 'herhangi bir terimde ara';
 $lang['Empty query. No criteria has been entered.'] = 'boş sorgulama. arama kriteri girilmedi.';
 $lang['Search Options'] = 'Detaylı arama';
 $lang['Search results'] = 'Arama sonuçları';
-$lang['Search in subcategories'] = 'Alt kategorilerde ara';
+$lang['Search in sub-albums'] = 'Alt kategorilerde ara';
 $lang['Contact'] = 'iletişim';
 $lang['Show number of comments'] = 'yorumların sayısını göster';
 $lang['Show number of hits'] = 'hit sayısını göster';
@@ -372,7 +372,7 @@ $lang['today'] = 'bugün';
 $lang['Thumbnails'] = 'Küçük resimler';
 $lang['searched words : %s'] = 'aranan kelimeler : %s';
 $lang['display a calendar by creation date'] = 'oluşturma tarihini takvimde göster';
-$lang['set as category representative'] = 'varsayılan kategori yap';
+$lang['set as album representative'] = 'varsayılan kategori yap';
 $lang['slideshow'] = 'slayt gösterisi';
 $lang['the beginning'] = 'başlangıç';
 $lang['Email address is missing. Please specify an email address.'] = 'E-Posta Adresi Kayıp. Lütfen E-Posta adresinizi doğrulayınız..';
diff --git a/language/vi_VN/admin.lang.php b/language/vi_VN/admin.lang.php
index 33eb8ff92..6e604c19e 100644
--- a/language/vi_VN/admin.lang.php
+++ b/language/vi_VN/admin.lang.php
@@ -23,14 +23,14 @@
 

 $lang['%d association'] = '%d kết hợp';

 $lang['%d associations'] = '%d kết hợp';

-$lang['%d category including'] = '%d đề mục bao gồm ';

-$lang['%d categories including'] = '%d đề mục bao gồm ';

+$lang['%d album including'] = '%d đề mục bao gồm ';

+$lang['%d albums including'] = '%d đề mục bao gồm ';

 $lang['%d physical'] = '%d physical';

 $lang['%d physical'] = '%d physical';

 $lang[' and %d virtual'] = ' và %d thư mục ảo';

 $lang[' and %d virtual'] = ' và %d thư mục ảo';

-$lang['%d category moved'] = '%d đề mục đã được chuyển';

-$lang['%d categories moved'] = '%d đề mục đã được chuyển';

+$lang['%d album moved'] = '%d đề mục đã được chuyển';

+$lang['%d albums moved'] = '%d đề mục đã được chuyển';

 $lang['%d group'] = '%d nhóm';

 $lang['%d groups'] = '%d nhóm';

 $lang['%d member'] = '%d thành viên';

@@ -597,7 +597,7 @@ $lang['overrides existing values with empty ones'] = 'ghi đè giá trị đang
 $lang['manage image ranks'] = 'Quản lý xếp hạng hình ảnh';

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

 $lang['Edit ranks'] = 'Biên tập xếp hạng';

-$lang['No element in this category'] = 'Không có thành phần nào trong đề mục này';

+$lang['No element in this album'] = 'Không có thành phần nào trong đề mục này';

 $lang['Images manual order was saved'] = 'Sắp xếp hình ảnh thủ công đã được lưu';

 $lang['ranks'] = 'xếp hạng';

 $lang['Drag to re-order'] = 'Kéo rê để sắp xếp lại';

diff --git a/language/vi_VN/common.lang.php b/language/vi_VN/common.lang.php
index 29c0b3e87..f7cbc0f7e 100644
--- a/language/vi_VN/common.lang.php
+++ b/language/vi_VN/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['zero_plural'] = true;
 

 $lang['%.2f (rated %d times)'] = '%.2f (được đánh giá trên %d lần)';

 $lang['%d Kb'] = '%d Kb';

-$lang['%d category updated'] = '%d đề mục đã được cập nhật';

-$lang['%d categories updated'] = '%d đề mục đã được cập nhật';

+$lang['%d album updated'] = '%d đề mục đã được cập nhật';

+$lang['%d albums updated'] = '%d đề mục đã được cập nhật';

 $lang['%d comment to validate'] = '%d lời bình cần xác nhận';

 $lang['%d comments to validate'] = '%d lời bình cần xác nhận';

 $lang['%d new comment'] = '%d lời bình mới';

@@ -116,7 +116,7 @@ $lang['Sort by'] = 'Sắp xếp theo';
 $lang['Sort order'] = 'Vị trí sắp xếp';

 $lang['Tag'] = 'Thẻ';

 $lang['Tags'] = 'Thẻ';

-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'Bản thông báo RSS feed cung cấp thông báo về tin tức và cập nhật trên trang này bao gồm: hình ảnh mới, đề mục được cập nhật và lời bình mới. Hãy sử dụng trình đọc RSS Feed.';

+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'Bản thông báo RSS feed cung cấp thông báo về tin tức và cập nhật trên trang này bao gồm: hình ảnh mới, đề mục được cập nhật và lời bình mới. Hãy sử dụng trình đọc RSS Feed.';

 $lang['Unknown feed identifier'] = 'Nguồn cung cấp tin không xác nhận';

 $lang['User comments'] = 'Bình luận của thành viên';

 $lang['Username'] = 'Tên đăng nhập';

@@ -132,7 +132,7 @@ $lang['Adviser mode enabled'] = 'Chế độ hỗ trợ được kích hoạt';
 $lang['all'] = 'tất cả';

 $lang['ascending'] = 'từ dưới lên';

 $lang['author(s) : %s'] = 'tác giả: %s';

-$lang['Expand all categories'] = 'Mở rộng các đề mục';

+$lang['Expand all albums'] = 'Mở rộng các đề mục';

 $lang['posted after %s (%s)'] = 'gởi sau %s (%s)';

 $lang['posted before %s (%s)'] = 'gởi trước %s (%s)';

 $lang['posted between %s (%s) and %s (%s)'] = 'gởi vào giữa %s (%s) và %s (%s)';

@@ -188,15 +188,15 @@ $lang['Page generated in'] = 'Trang được tạo trong vòng';
 $lang['guest'] = 'khách';

 $lang['Hello'] = 'Xin chào';

 $lang['available for administrators only'] = 'chỉ dành cho Quản trị';

-$lang['shows images at the root of this category'] = 'hiện hình này ở phía trên của đề mục';

+$lang['shows images at the root of this album'] = 'hiện hình này ở phía trên của đề mục';

 $lang['See last users comments'] = 'Xem bình luận gần nhất';

 $lang['customize the appareance of the gallery'] = 'tuỳ chọn giao diện hiển thị của gallery';

 $lang['search'] = 'tìm kiếm';

 $lang['Home'] = 'Trang chủ';

 $lang['Identification'] = 'Định danh';

-$lang['in this category'] = 'trong mục này';

-$lang['in %d sub-category'] = 'trong %d mục nhỏ';

-$lang['in %d sub-categories'] = 'trong %d các mục nhỏ';

+$lang['in this album'] = 'trong mục này';

+$lang['in %d sub-album'] = 'trong %d mục nhỏ';

+$lang['in %d sub-albums'] = 'trong %d các mục nhỏ';

 $lang['included'] = 'bao gồm';

 $lang['Invalid password!'] = 'Sai mật khẩu!';

 $lang['Language']='Ngôn ngữ';

@@ -210,7 +210,7 @@ $lang['Maximum height must be a number superior to 50'] = 'Chiều cao tối đa
 $lang['Maximum width of the pictures'] = 'Chiều rộng tối đa của hình';

 $lang['Maximum width must be a number superior to 50'] = 'Chiều rộng tối đa của hình phải trên 50 pixel';

 $lang['display a calendar by creation date'] = 'hiển thị lịch theo ngày gởi hình';

-$lang['display all elements in all sub-categories'] = 'hiển thị mọi thành phần có trong tất cả mục nhỏ';

+$lang['display all elements in all sub-albums'] = 'hiển thị mọi thành phần có trong tất cả mục nhỏ';

 $lang['return to normal view mode'] = 'chuyện lại chế độ xem hình bình thường';

 $lang['display a calendar by posted date'] = 'hiển thị lịch theo ngày gởi hình';

 $lang['month'][10] = 'Tháng Mười';

@@ -248,8 +248,8 @@ $lang['Preferences'] = 'Tuỳ chọn thêm';
 $lang['Previous'] = 'Trước';

 $lang['Random pictures'] = 'Hình ngẫu nhiên';

 $lang['display a set of random pictures'] = 'hiển thị một bộ các hình ngẫu nhiên';

-$lang['Recent categories'] = 'Các đề mục gần đây';

-$lang['display recently updated categories'] = 'hiển thị các đề mục gần đây';

+$lang['Recent albums'] = 'Các đề mục gần đây';

+$lang['display recently updated albums'] = 'hiển thị các đề mục gần đây';

 $lang['Recent period'] = 'Chu kỳ gần đây';

 $lang['Recent pictures'] = 'Các hình gần đây';

 $lang['display most recent pictures'] = 'hiển thị các hình gần đây nhất';

@@ -265,7 +265,7 @@ $lang['remove this tag from the list'] = 'bỏ tag này khỏi danh sách';
 $lang['representative'] = 'đại diện';

 $lang['return to homepage'] = 'trở lại trang chủ';

 $lang['Search for Author'] = 'Tìm kiếm theo tác giả';

-$lang['Search in Categories'] = 'Tìm kiếm trong các đề mục';

+$lang['Search in albums'] = 'Tìm kiếm trong các đề mục';

 $lang['Search by Date'] = 'Tìm kiếm theo ngày tháng';

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

 $lang['End-Date'] = 'Ngày kết thúc';

@@ -276,10 +276,10 @@ $lang['Search for any terms'] = 'Tìm kiếm mọi mục';
 $lang['Empty query. No criteria has been entered.'] = 'Truy vấn xác định. Không có từ khoá nào được nhập';

 $lang['Search Options'] = 'Tuỳ chọn tìm kiếm';

 $lang['Search results'] = 'Kết quả tìm kiếm';

-$lang['Search in subcategories'] = 'Tìm kiếm trong các mục nhỏ';

+$lang['Search in sub-albums'] = 'Tìm kiếm trong các mục nhỏ';

 $lang['searched words : %s'] = 'những từ khoá được tìm kiếm : %s';

 $lang['Contact'] = 'Liên hệ';

-$lang['set as category representative'] = 'đặt như là một đề mục đại diện';

+$lang['set as album representative'] = 'đặt như là một đề mục đại diện';

 $lang['Show number of comments'] = 'Hiện số lần hình luận';

 $lang['Show number of hits'] = 'Hiện số lần xem';

 $lang['slideshow'] = 'trình chiéu';

@@ -321,7 +321,7 @@ $lang['User: %s'] = 'Tài khoản: %s';
 $lang['Email: %s'] = 'Địa chỉ email: %s';

 $lang['Admin: %s'] = 'Quản trị: %s';

 $lang['Registration of %s'] = 'Mục đăng ký của %s';

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

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

 $lang['Picture name: %s'] = 'Tên hình: %s';

 $lang['Creation date: %s'] = 'Ngày gởi: %s';

 $lang['Waiting page: %s'] = 'Trang đợi: %s';

@@ -331,7 +331,7 @@ $lang['Bad status for user "guest", using default status. Please notify the webm
 // --------- Starting below: New or revised $lang ---- from Butterfly (2.0)

 $lang['Administrator, webmaster and special user cannot use this method'] = 'Quản trị viên và thành viên đặc biệt không thể sử dụng cách này';

 $lang['a user use already this mail address'] = 'đã có thành viên sử dụng địa chỉ email này';

-$lang['Category results for'] = 'Kết quả đề mục cho';

+$lang['Album results for'] = 'Kết quả đề mục cho';

 $lang['Tag results for'] = 'Kết quả tag cho';

 $lang['from %s to %s'] = 'từ %s đến %s';

 $lang['Play of slideshow'] = 'Bật trình chiếu';

diff --git a/language/zh_CN/admin.lang.php b/language/zh_CN/admin.lang.php
index 0dbd00929..38ff5600d 100644
--- a/language/zh_CN/admin.lang.php
+++ b/language/zh_CN/admin.lang.php
@@ -23,14 +23,14 @@
 
 $lang['%d association'] = '%d 相关';
 $lang['%d associations'] = '%d 相关';
-$lang['%d category including'] = '包含 %d 类';
-$lang['%d categories including'] = '包含 %d 等类';
+$lang['%d album including'] = '包含 %d 类';
+$lang['%d albums including'] = '包含 %d 等类';
 $lang['%d physical'] = '物理 %d';
 $lang['%d physical'] = '物理 %d ';
 $lang[' and %d virtual'] = ' 和 虚拟 %d ';
 $lang[' and %d virtual'] = ' 和 虚拟 %d ';
-$lang['%d category moved'] = '%d 类已迁移';
-$lang['%d categories moved'] = '%d 等类已迁移';
+$lang['%d album moved'] = '%d 类已迁移';
+$lang['%d albums moved'] = '%d 等类已迁移';
 $lang['%d group'] = '%d 组';
 $lang['%d groups'] = '%d 组';
 $lang['%d member'] = '%d 成员';
@@ -596,7 +596,7 @@ $lang['overrides existing values with empty ones'] = '用空数据来删除已�
 $lang['manage image ranks'] = '管理图片排序';
 $lang['Manage image ranks'] = '管理图片排序';
 $lang['Edit ranks'] = '修改排序方式';
-$lang['No element in this category'] = '该类中没有图片';
+$lang['No element in this album'] = '该类中没有图片';
 $lang['Images manual order was saved'] = '图片手动排序已保存';
 $lang['ranks'] = '顺序';
 $lang['Drag to re-order'] = '拖放进行排序';
diff --git a/language/zh_CN/common.lang.php b/language/zh_CN/common.lang.php
index 788b681ad..833c76aa1 100644
--- a/language/zh_CN/common.lang.php
+++ b/language/zh_CN/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['zero_plural'] = false;
 
 $lang['%.2f (rated %d times)'] = '%.2f (标注 %d 次)';
 $lang['%d Kb'] = '%d KB';
-$lang['%d category updated'] = '%d 类已更新';
-$lang['%d categories updated'] = '%d 等多类已更新';
+$lang['%d album updated'] = '%d 类已更新';
+$lang['%d albums updated'] = '%d 等多类已更新';
 $lang['%d comment to validate'] = '%d 条用户评论被确认';
 $lang['%d comments to validate'] = '%d 条用户评论被确认';
 $lang['%d new comment'] = '%d 新评论';
@@ -117,7 +117,7 @@ $lang['Sort by'] = '排序';
 $lang['Sort order'] = '排序规则';
 $lang['Tag'] = '标签';
 $lang['Tags'] = '标签簇';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'RSS提供通知更新事件功能 : 加入新图片, 更新图类, 新的用户评论. 请使用相关软件来获得RSS.';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'RSS提供通知更新事件功能 : 加入新图片, 更新图类, 新的用户评论. 请使用相关软件来获得RSS.';
 $lang['Unknown feed identifier'] = '未知流标识';
 $lang['User comments'] = '用户评论';
 $lang['Username'] = '用户名';
@@ -133,7 +133,7 @@ $lang['Adviser mode enabled'] = '激活建议模式';
 $lang['all'] = '所有';
 $lang['ascending'] = '升序';
 $lang['author(s) : %s'] = '拥有者 : %s';
-$lang['Expand all categories'] = '展开所有类';
+$lang['Expand all albums'] = '展开所有类';
 $lang['posted after %s (%s)'] = '插入到 %s (%s) 之后';
 $lang['posted before %s (%s)'] = '插入到 %s (%s) 之前';
 $lang['posted between %s (%s) and %s (%s)'] = '插入到 %s (%s) 和 le %s (%s) 之间';
@@ -189,15 +189,15 @@ $lang['Page generated in'] = '页面创建时间';
 $lang['guest'] = '游客';
 $lang['Hello'] = '你好';
 $lang['available for administrators only'] = '只限于管理者';
-$lang['shows images at the root of this category'] = '显示所有此类图片';
+$lang['shows images at the root of this album'] = '显示所有此类图片';
 $lang['See last users comments'] = '查看最新用户评论';
 $lang['customize the appareance of the gallery'] = '个性化设置';
 $lang['search'] = '搜索';
 $lang['Home'] = '主页';
 $lang['Identification'] = '身份鉴别';
-$lang['in this category'] = '在此类中';
-$lang['in %d sub-category'] = '在 %d 子类中';
-$lang['in %d sub-categories'] = '在 %d 等子类中';
+$lang['in this album'] = '在此类中';
+$lang['in %d sub-album'] = '在 %d 子类中';
+$lang['in %d sub-albums'] = '在 %d 等子类中';
 $lang['included'] = '包括';
 $lang['Invalid password!'] = '密码不正确!';
 $lang['Language'] = '语言';
@@ -211,7 +211,7 @@ $lang['Maximum height must be a number superior to 50'] = '图片最大长度必
 $lang['Maximum width of the pictures'] = '图片的最大宽度';
 $lang['Maximum width must be a number superior to 50'] = '图片最大宽度必须大于50';
 $lang['display a calendar by creation date'] = '通过创建时间显示日历';
-$lang['display all elements in all sub-categories'] = '平铺显示所有类及其子类图片';
+$lang['display all elements in all sub-albums'] = '平铺显示所有类及其子类图片';
 $lang['return to normal view mode'] = '返回到普通模式显示';
 $lang['display a calendar by posted date'] = '通过发送时间来显示日历';
 $lang['month'][10] = '十月';
@@ -249,8 +249,8 @@ $lang['Preferences'] = '使用偏好';
 $lang['Previous'] = '前页';
 $lang['Random pictures'] = '随机图片';
 $lang['display a set of random pictures'] = '随机显示图片';
-$lang['Recent categories'] = '最近更新的类';
-$lang['display recently updated categories'] = '显示最近更新或创建的类';
+$lang['Recent albums'] = '最近更新的类';
+$lang['display recently updated albums'] = '显示最近更新或创建的类';
 $lang['Recent period'] = '最近阶段';
 $lang['Recent pictures'] = '最新图片';
 $lang['display most recent pictures'] = '显示最新图片';
@@ -266,7 +266,7 @@ $lang['remove this tag from the list'] = '删除此标签';
 $lang['representative'] = '代理人';
 $lang['return to homepage'] = '返回首页';
 $lang['Search for Author'] = '搜索上传者';
-$lang['Search in Categories'] = '在这些类中查询';
+$lang['Search in albums'] = '在这些类中查询';
 $lang['Search by Date'] = '通过日期查询';
 $lang['Date'] = '开始日期';
 $lang['End-Date'] = '最终日期';
@@ -277,10 +277,10 @@ $lang['Search for any terms'] = '以或模式查询';
 $lang['Empty query. No criteria has been entered.'] = '查询语句不能为空';
 $lang['Search Options'] = '查询选项';
 $lang['Search results'] = '搜索结果';
-$lang['Search in subcategories'] = '在子类中搜索';
+$lang['Search in sub-albums'] = '在子类中搜索';
 $lang['searched words : %s'] = '搜索词 : %s';
 $lang['Contact'] = '联系';
-$lang['set as category representative'] = '选择此类代理';
+$lang['set as album representative'] = '选择此类代理';
 $lang['Show number of comments'] = '显示评论总数';
 $lang['Show number of hits'] = '显示查看次数';
 $lang['slideshow'] = '幻灯片放映';
@@ -322,7 +322,7 @@ $lang['User: %s'] = '用户: %s';
 $lang['Email: %s'] = '电子邮件: %s';
 $lang['Admin: %s'] = '管理员: %s';
 $lang['Registration of %s'] = '注册 %s';
-$lang['Category: %s'] = '类别: %s';
+$lang['Album: %s'] = '类别: %s';
 $lang['Picture name: %s'] = '图片名: %s';
 $lang['Creation date: %s'] = '创建日期: %d';
 $lang['Waiting page: %s'] = '等待页面: %s';
@@ -332,7 +332,7 @@ $lang['Bad status for user "guest", using default status. Please notify the webm
 // --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = '管理员, 网管和特定用户不能使用此方法功能';
 $lang['a user use already this mail address'] = '邮箱地址已存在';
-$lang['Category results for'] = '符合查询类结果';
+$lang['Album results for'] = '符合查询类结果';
 $lang['Tag results for'] = '符合查询标签结果';
 $lang['from %s to %s'] = '从 %s 到 %s';
 $lang['Play of slideshow'] = '播放';