feature 1616: after the backport of nearly all languages from branch 2.1 to

trunk, reapply the Albums plugin into trunk for languages cs_CZ es_ES de_DE
lv_LV pl_PL ru_RU sk_SK tr_TR zh_CN


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

27 files changed, 792 insertions, 792 deletions

diff --git a/language/cs_CZ/admin.lang.php b/language/cs_CZ/admin.lang.php
index fb7bc211f..d1a873111 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 album';
+$lang['%d albums including'] = '%d alb';
 $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 album přesunuto';
+$lang['%d albums moved'] = '%d alb přesunuto';
 $lang['%d group'] = '%d skupina';
 $lang['%d groups'] = '%d skupin';
 $lang['%d member'] = '%d účastník';
@@ -60,15 +60,15 @@ $lang['Add group'] = 'Přidat skupinu';
 $lang['Add selected elements to caddie'] = 'Přidat vybrané položky do košíku';
 $lang['Add'] = 'Přidat';
 $lang['Allow user registration'] = 'Povolit registraci uživatelů';
-$lang['Apply to subcategories'] = 'Použít na podkategorie';
+$lang['Apply to sub-albums'] = 'Použít na subalba';
 $lang['Associated'] = 'Přiřazeno';
-$lang['Association to categories'] = 'Spojit s kategorií';
+$lang['Association to categories'] = 'Asociovat s alby';
 $lang['Batch management'] = 'Správa dávkových úkonů';
 $lang['Caddie management'] = 'Správa košíku';
 $lang['Caddie'] = 'Košík';
-$lang['Categories authorized thanks to group associations'] = 'Kategorie schváleny díky skupinovým spojením';
-$lang['Categories manual order was saved'] = 'Manuální řazení kategorií bylo schváleno';
-$lang['Category elements associated to the following categories: %s'] = 'Položky kategorií navázány do následujících kategorií: %s';
+$lang['Albums authorized thanks to group associations'] = 'Alba autorizována díky skupinovému sloučení';
+$lang['Album manual order was saved'] = 'Alba s ručním vyběrem byla uložena';
+$lang['Album elements associated to the following albums: %s'] = 'Fotky alb přiřazeny k následujícím albům: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'Zjištění možnosti aktualizace se nezdařilo';
 $lang['Check for upgrade'] = 'Zjistit možnost aktualizace';
 $lang['Comments for all'] = 'Komentáře pro všechny';
@@ -106,37 +106,37 @@ $lang['Guests'] = 'Hosté';
 $lang['History'] = 'Historie';
 $lang['Informations'] = 'Informace';
 $lang['Install'] = 'Instalovat';
-$lang['Link all category elements to a new category'] = 'Napojit všechny položky na novou kategorii';
-$lang['Link all category elements to some existing categories'] = 'Napojit všechny položky na některé existující kategorie';
-$lang['Linked categories'] = 'Napojené kategorie';
+$lang['Link all album elements to a new album'] = 'Napojí všechny fotky do nového alba';
+$lang['Link all album elements to some existing albums'] = 'Napojí všechny fotky na existující alba';
+$lang['Linked albums'] = 'Propojená alba';
 $lang['Lock gallery'] = 'Zamknout galerii';
 $lang['Maintenance'] = 'Údržba';
-$lang['Manage permissions for a category'] = 'Nastavit práva pro kategorii';
+$lang['Edit album permissions'] = 'Editace oprávnění pro dané album';
 $lang['Manage permissions for group "%s"'] = 'Nastavit práva pro skupinu "%s"';
 $lang['Manage permissions for user "%s"'] = 'Nastavit práva pro uživatele "%s"';
 $lang['Manage tags'] = 'Správa klíčových slov';
 $lang['Members'] = 'Členové';
 $lang['Metadata synchronized from file'] = 'Metadata synchronizována ze souboru';
-$lang['Move categories'] = 'Přesunout kategorie';
+$lang['Move albums'] = 'Přesun alb';
 $lang['Move'] = 'Přesunout';
 $lang['Name'] = 'Jméno';
 $lang['New name'] = 'Nové jméno';
-$lang['New parent category'] = 'Nová rodičovská kategorie';
+$lang['New parent album'] = 'Nové hlavní album';
 $lang['New tag'] = 'Nové klíčové slovo';
 $lang['Number of comments per page'] = 'Počet komentářů na stránce';
 $lang['Number of rates'] = 'Počet hodnocení';
 $lang['Number of thumbnails to create'] = 'Počet náhledů k vytvoření';
-$lang['Only private categories are listed'] = 'Jsou zobrazeny pouze soukromé kategorie';
+$lang['Only private albums are listed'] = 'Pouze soukromá alba jsou uvedena';
 $lang['Operating system'] = 'Operační systém';
 $lang['Options'] = 'Nastavení';
-$lang['Other private categories'] = 'Další soukromé kategorie';
+$lang['Other private albums'] = 'Ostatní soukromá alba';
 $lang['Page banner'] = 'Banner stránky';
-$lang['Parent category'] = 'Rodičovská kategorie';
+$lang['Parent album'] = 'Hlavní album';
 $lang['Path'] = 'Cesta';
 $lang['Permalink'] = 'Pernamentní spojení';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'Pernamentní spojení %s bylo předtím použito kategorií %s. Nejprve smažte z historie spojení.';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'Permalink %s byl dříve používán albem %s. Nejprve ho vymažte z historie permalinků';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'Pernamentní spojení musí být složeno ze znaků a-z, A-Z, 0-9, "-", "_" nebo "/". Nelze použít pouze číslo nebo číslo následované "-"';
-$lang['Permalink %s is already used by category %s'] = 'Pernamentní spojení je již využíváno kategorií %s';
+$lang['Permalink %s is already used by album %s'] = 'Permalink %s již používá album %s';
 $lang['Permalink history'] = 'Historie pernamentního spojení';
 $lang['Permalinks'] = 'Pernamentní spojení';
 $lang['Permission denied'] = 'Přístup zamítnut';
@@ -154,19 +154,19 @@ $lang['Rating'] = 'Hodnocení';
 $lang['Reject All'] = 'Zamítnout všechny';
 $lang['Reject'] = 'Zamítnout';
 $lang['Representant'] = 'Reprezentant';
-$lang['Representation of categories'] = 'Reprezentantativní fotografie pro kategorii';
+$lang['Representation of albums'] = 'Alba reprezentace';
 $lang['Representative'] = 'Reprezentativní fotografie';
 $lang['Represents'] = 'Reprezentativní fotografie';
 $lang['Save order'] = 'Uložit pořadí';
 $lang['Save to permalink history'] = 'Uložit do historie pernamentního spojení';
-$lang['Select at least one category'] = 'Je nutné zvolit alespoň jednu kategorii';
+$lang['Select at least one album'] = 'Vyberte alespoň jedno album';
 $lang['Select at least one picture'] = 'Je nutné zvolit alespoň jednu fotografii';
 $lang['Select at least one user'] = 'Je nutné zvolit alespoň jednoho uživatele';
 $lang['Show info'] = 'Zobrazit informace';
 $lang['Site manager'] = 'Správce stránky';
 $lang['Status'] = 'Stav';
 $lang['Statistics'] = 'Statistiky';
-$lang['Storage category'] = 'Kategorie umístění';
+$lang['Storage album'] = 'Uložené album';
 $lang['Sum of rates'] = 'Sumarizace hodnocení';
 $lang['Tag "%s" already exists'] = 'Klíčové slovo "%" už existuje';
 $lang['Tag "%s" was added'] = '"%" klíčových slov bylo přidáno';
@@ -182,32 +182,32 @@ $lang['Validate All'] = 'Schválit všechny';
 $lang['Validate'] = 'Schválit';
 $lang['Validation'] = 'Schválení';
 $lang['Version'] = 'Verze';
-$lang['Virtual categories movement'] = 'Přesun virtuálních kategorií';
-$lang['Virtual categories to move'] = 'Virtuální kategorie k přesunu';
-$lang['Virtual category name'] = 'Název virtuální kategorie';
+$lang['Virtual categories movement'] = 'Virtuální přesun alb';
+$lang['Virtual albums to move'] = 'Virtuální alba k přesunu';
+$lang['Virtual album name'] = 'Název virtuálního alba';
 $lang['Webmaster cannot be deleted'] = 'Administrátor nemůže být smazán';
 $lang['You are running on development sources, no check possible.'] = 'Jsou používány vývojové zdrojové kódy, zjištění není možné.';
 $lang['You cannot delete your account'] = 'Nemůžete smazat svůj účet';
-$lang['You cannot move a category in its own sub category'] = 'Nelze přesunout kategorii do její vlastní podkategorie';
+$lang['You cannot move an album in its own sub album'] = 'Nemůžete přesunout album do jeho vlastního sub alba';
 $lang['You need to confirm deletion'] = 'Je nutné potvrdit vymazání';
 $lang['add tags'] = 'Přidat klíčová slova';
 $lang['Adviser'] = 'Průvodce';
-$lang['associate to category'] = 'Přiřadit ke kategorii';
+$lang['Associate to album'] = 'přiřadit k album';
 $lang['associate to group'] = 'Přiřadit ke skupině';
 $lang['Authorized'] = 'Autorizováno';
-$lang['Add a virtual category'] = 'Přidat virtuální kategorii';
-$lang['Authorize users to add comments on selected categories'] = 'Povolit uživatelům komentovat vybrané kategorie';
-$lang['The name of a category should not be empty'] = 'Jméno kategorie nesmí být prázdné';
-$lang['Lock categories'] = 'Zamknout kategorie';
-$lang['Private category'] = 'Soukromá kategorie';
-$lang['Public category'] = 'Veřejná kategorie';
+$lang['Add a virtual album'] = 'Přidat virtuální album';
+$lang['Authorize users to add comments on selected albums'] = 'Povolit uživatelům přidávat komentáře k vybraným albám';
+$lang['The name of an album must not be empty'] = 'Název alba nesmí být prázdný';
+$lang['Lock albums'] = 'Zamknout alba';
+$lang['Private'] = 'Privátní album';
+$lang['Public'] = 'Veřejné album';
 $lang['Find a new representant by random'] = 'Najít reprezentativní obrázek pomocí náhodného výběru';
 $lang['Public / Private'] = 'Veřejná / Soukromá';
-$lang['Manage authorizations for selected categories'] = 'Nastavit oprávnění pro vybrané kategorie';
-$lang['Select uploadable categories'] = 'Zvolit kategorie s možností nahrávání obsahu';
-$lang['Virtual category added'] = 'Virtuální kategorie přidána';
-$lang['Virtual category deleted'] = 'Virtuální kategorie smazána';
-$lang['Category'] = 'Kategorie';
+$lang['Manage authorizations for selected albums'] = 'Nastavit oprávnění pro vybraná alba';
+$lang['Select uploadable albums'] = 'Vyber uploadovatelná alba';
+$lang['Virtual album added'] = 'Virtuální album přidáno';
+$lang['Virtual album deleted'] = 'Virtuální album odstraněno';
+$lang['Album'] = 'Album';
 $lang['Access type'] = 'Druh přístupu';
 $lang['Comments'] = 'Komentáře uživatelů';
 $lang['Information data registered in database'] = 'Data byla uložena do databáze';
@@ -219,11 +219,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = 'Po�
 $lang['Configuration'] = 'Konfigurace';
 $lang['confirm'] = 'Potvrdit';
 $lang['Date'] = 'Datum';
-$lang['delete category'] = 'Vymazat kategorii';
-$lang['dissociate from category'] = 'Oddělit od kategorie';
+$lang['delete album'] = 'smazat album';
+$lang['Dissociate from album'] = 'oddělit od album';
 $lang['dissociate from group'] = 'Oddělit od skupiny';
-$lang['edit category permissions'] = 'Upravit oprávnění ke kategorii';
-$lang['Category informations updated successfully.'] = 'Informace o kategorii byly úspěšně aktualizovány';
+$lang['edit album permissions'] = 'editace oprávnění album';
+$lang['Album updated successfully'] = 'Informace o album uloženy.';
 $lang['Authorize upload'] = 'Povolit nahrávání fotografií';
 $lang['elements per page'] = 'Položek na stránce';
 $lang['elements'] = 'Položky';
@@ -241,13 +241,13 @@ $lang['The name of a group must not contain " or \' or be empty.'] = 'Název sku
 $lang['This name is already used by another group.'] = 'Toto jméno je již používáno pro jinou skupinu.';
 $lang[''] = '';
 $lang['High definition'] = 'Vysoké rozlišení';
-$lang['jump to category'] = 'Přejít do kategorie';
+$lang['jump to album'] = 'přejít na album';
 $lang['jump to image'] = 'Přejít na obrázek';
 $lang['leave'] = 'Ponechat';
 $lang['Lock'] = 'Zamknout';
 $lang['Locked'] = 'Uzamknuto';
-$lang['manage category elements'] = 'Spravovat položky kategorie';
-$lang['manage sub-categories'] = 'Spravovat podkategorie';
+$lang['manage album elements'] = 'Spravuj fotky alba';
+$lang['manage sub-albums'] = 'Správa sub-alb';
 $lang['Manage'] = 'Správa';
 $lang['maximum height'] = 'maximální výška';
 $lang['maximum width'] = 'maximální šířka';
@@ -357,15 +357,15 @@ $lang['synchronize'] = 'Synchronizovat';
 $lang['update the database from files'] = 'Aktualizovat databázi ze souborů';
 $lang['status'] = 'Stav';
 $lang['Directory'] = 'Adresář';
-$lang['sub-categories'] = 'Podkategorie';
+$lang['sub-albums'] = 'sub-alba';
 $lang['synchronize metadata'] = 'Synchronizovat metadata';
 $lang['target'] = 'Cíl';
 $lang['Thumbnail'] = 'Náhled';
 $lang['title'] = 'Název';
-$lang['Categories management'] = 'Správa kategorií';
+$lang['Album list management'] = 'Správa alb';
 $lang['Piwigo configuration'] = 'Nastavení aplikace Piwigo';
 $lang['Piwigo administration'] = 'Administrace aplikace Piwigo';
-$lang['Edit a category'] = 'Editovat kategorii';
+$lang['Edit album'] = 'Edituj album';
 $lang['Group management'] = 'Správa skupin';
 $lang['User list'] = 'Seznam uživatelů';
 $lang['Modify informations about a picture'] = 'Upravit informace o fotografii';
@@ -393,12 +393,12 @@ $lang['for this file format'] = 'pro tento formát souboru';
 $lang['unit mode'] = 'jednotlivě';
 $lang['Unlocked'] = 'Odemknuto';
 $lang['unset'] = 'Nenastavovat';
-$lang['Update categories informations'] = 'Aktualizovat informace o kategoriích';
+$lang['Update albums informations'] = 'Aktualizuj informace alb';
 $lang['Update images informations'] = 'Aktualizovat informace o fotografiích';
 $lang['Synchronize'] = 'Synchronizace';
-$lang['reduce to single existing categories'] = 'Převést do jediné existující kategorie';
+$lang['reduce to single existing albums'] = 'zredukuj na stávající alba';
 $lang['Choose an option'] = 'Zvolit nastavení';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = 'Zobrazit veškeré informace informací (přidané a odstraněné kategorie a položky)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = 'zobrazit maximum informací (přidaná alba a elementy, odstraněná alba a elementy)';
 $lang['Piwigo version differs on the remote site'] = 'Verze Piwigo na vzdálené stránce není stejná jako místní';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'Verze souboru create_listing_file.php na vzdálené stránce musí být stejná jako verze místního souboru';
 $lang['listing.xml file was not found'] = 'Soubor listing.xml nebyl nalezen';
@@ -408,14 +408,14 @@ $lang['Errors caption'] = 'Chyby - legenda';
 $lang['Detailed informations'] = 'Detailní informace';
 $lang['File/directory read error'] = 'Chyba při čtení souboru/adresáře';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'Soubor nebo adresář není přístupný nebo neexistuje';
-$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'typ souboru vyžaduje náhled. Náhled musí být umístěn v podadresáři "thumbnail" v adresáři s kategorií. Název souboru náhledu musí začínat nastavenou předponou a přípona musí korespondovat s následujícím seznamem :';
+$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the album directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'typ souboru vyžaduje náhled. Náhled musí být umístěn v podadresáři "thumbnail" v adresáři s kategorií. Název souboru náhledu musí začínat nastavenou předponou a přípona musí korespondovat s následujícím seznamem :';
 $lang['missing thumbnail'] = 'žádný náhled';
-$lang['categories deleted in the database'] = 'kategorií odstraněno z databáze';
+$lang['albums deleted in the database'] = 'alba odstraněna v databázi';
 $lang['elements deleted in the database'] = 'položek odstraněno z databáze';
 $lang['images candidates for metadata synchronization'] = 'fotografií pro synchronizaci metadat';
 $lang['elements informations synchronized with files metadata'] = 'informace synchronizované z metadat souborů';
 $lang['errors during synchronization'] = 'chyb během synchronizace';
-$lang['categories added in the database'] = 'kategorií přidáno do databáze';
+$lang['albums added in the database'] = 'alba vložena do databáze';
 $lang['elements added in the database'] = 'položek přidáno do databáze';
 $lang['elements updated in the database'] = 'položek aktualizováno v databázi';
 $lang['Search for new images in the directories'] = 'Hledat nové obrázky v kategoriích';
@@ -440,14 +440,14 @@ $lang['user_status_generic'] = 'Generic';
 $lang['user_status_guest'] = 'Host';
 $lang['user_status_normal'] = 'Uživatel';
 $lang['user_status_webmaster'] = 'Administrátor';
-$lang['Virtual category'] = 'Virtuální kategorie';
+$lang['Virtual album'] = 'Virtuální album';
 $lang['Waiting'] = 'Ke schválení';
 $lang['default'] = 'výchozí';
 $lang['Toggle \'default group\' property'] = 'Přepnout vlastnost \'základní skupina\'';
 $lang['Advanced features'] = 'Rozšířené vlastnosti';
 $lang['Not linked elements'] = 'Nepřipojené položky';
 $lang['Specials'] = 'Ostatní';
-$lang['Files with same name in more than one physical category'] = 'Soubory se stejným názvem ve více než jedné fyzické kategorii';
+$lang['Files with same name in more than one physical album'] = 'Identické názvy souborů ve více než jednom fyzickém albu';
 $lang['Overall'] = 'Celkově';
 $lang['Year'] = 'Rok';
 $lang['Month'] = 'Měsíc';
@@ -465,10 +465,10 @@ $lang['Save page visits by administrators'] = 'Ukládat stránky navštívené a
 $lang['An information email was sent to group "%s"'] = 'Informační e-mail byl poslán skupině "%s';
 $lang['Send an information email to group members'] = 'Poslat informační e-mail uživatelům skupiny';
 $lang['Group'] = 'Skupina';
-$lang['[%s] Come to visit the category %s'] = '[%s] Navštívilo kategorii %s';
+$lang['[%s] Visit album %s'] = '[%s] Navštivte album %s';
 $lang['Hello,'] = 'Dobrý den,';
 $lang['See you soon.'] = 'Nashledanou.';
-$lang['Come to discover the category:'] = 'Navštivte kategorii:';
+$lang['Discover album:'] = 'Objevit album:';
 $lang['Mail content'] = 'Obsah e-mailu';
 $lang['none'] = 'žádný';
 $lang['high'] = 'vysoký';
@@ -593,13 +593,13 @@ $lang['Templates configuration has been recorded.'] = 'Nastavení šablon bylo u
 $lang['All optimizations have been successfully completed.'] = 'Všechny změny byly úspěšně dokončeny.';
 $lang['Optimizations have been completed with some errors.'] = 'Změny byly dokončeny s několika chybami.';
 $lang['Modify information'] = 'Upravit informace';
-$lang['edit category informations'] = 'upravit informace o kategorii';
+$lang['edit album'] = 'editovat info o tomto albu';
 $lang['nothing'] = 'prázdné';
 $lang['overrides existing values with empty ones'] = 'nahradit stávající hodnoty prázdnými';
 $lang['manage image ranks'] = 'spravovat hodnocení fotografií';
 $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'] = 'Žádný element v tomto albu';
 $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';
@@ -614,18 +614,18 @@ $lang['Number of downloads'] = 'Počet stažení';
 
 // --------- Starting below: New or revised $lang ---- from Colibri
 $lang['Upload Photos'] = 'Nahrát fotografie';
-$lang['Drop into category'] = 'Zpět do kategorie';
+$lang['Drop into album'] = 'Dát do alba';
 $lang['+ Add an upload box'] = '+ Přidat pole';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Vytvořte "%s" adresáře v kořenovém adresáři instalace Piwigo';
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Povolte zápis (chmod 777,644,atd.) do "%s" adresáře v kořenovém adresáři instalace Piwigo';
-$lang['existing category'] = 'stávající kategorie';
-$lang['create a new category'] = 'Založit novou Kategorii';
-$lang['Category name'] = 'Název kategorie';
-$lang['Category "%s" has been added'] = 'Kategorie "%s" přidána';
+$lang['existing album'] = 'existující album';
+$lang['create a new album'] = 'vytvořit nové album';
+$lang['Album name'] = 'Název alba';
+$lang['Album "%s" has been added'] = 'Kategorie "%s" přidána';
 $lang['Uploaded Photos'] = 'Nahrát fotografie';
 $lang['%d photos uploaded'] = '%d fotografií nahráno';
 $lang['Privacy level set to "%s"'] = 'Uroveň soukromí údajú nastaven na "%s"';
-$lang['Category "%s" now contains %d photos'] = 'Kategorie "%s" nyní obsahuje %d fotografií';
+$lang['Album "%s" now contains %d photos'] = 'Kategorie "%s" nyní obsahuje %d fotografií';
 $lang['Manage this set of %d photos'] = 'Spravovat tento soubor %d fotografií';
 $lang['Select files'] = 'Výběr souborů';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG soubory nebo ZIP archivy s JPEG soubory prosím.';
@@ -683,8 +683,8 @@ $lang['Your configuration settings are saved'] = 'Vaše nastavení bylo uloženo
 $lang['Active Themes'] = 'Aktivní témata';
 $lang['Add write access to the "%s" directory'] = 'nastavte přístup pro zápis do adresáře "%s"';
 $lang['Administration Home'] = 'Úvodní stránka administrace';
-$lang['Categories ordered alphanumerically'] = 'Kategorie seřazeny podle abecedy';
-$lang['Categories ordered alphanumerically reverse'] = 'Kategorie seřazeny sestupně podle abecedy';
+$lang['Categories ordered alphanumerically'] = 'Řazení alb alfanumericky';
+$lang['Categories ordered alphanumerically reverse'] = 'Alba řazena alfanumericky opačně';
 $lang['Change Admin Colors'] = 'Změňte barvy administrace';
 $lang['Delete this theme'] = 'Zrušte toto téma';
 $lang['Directory does not exist'] = 'Adresář neexistuje';
diff --git a/language/cs_CZ/common.lang.php b/language/cs_CZ/common.lang.php
index 5a9a222eb..89aeb4fad 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 album aktualizováno';
+$lang['%d albums updated'] = '%d alba 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ář';
@@ -57,8 +57,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Alespoň jedno pravidlo
 $lang['At least one tag must match'] = 'Alespoň jedno klíčové slovo musí odpovídat';
 $lang['Author'] = 'Autor';
 $lang['Average rate'] = 'Průměrné hodnocení';
-$lang['Categories'] = 'Kategorie';
-$lang['Category'] = 'Kategorie';
+$lang['Albums'] = 'Alba';
+$lang['Album'] = 'Album';
 $lang['Close this window'] = 'Zavřít okno';
 $lang['Complete RSS feed (images, comments)'] = 'Kompletní RSS vlákno (fotografie, komentáře)';
 $lang['Confirm Password'] = 'Potvrdit heslo';
@@ -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 zdroj obsahuje upozornění na nové události z tohoto webu: nové fotky, aktualizované galerie, nové komentáře. K použití se čtečkami RSS kanálů.';
 $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 alba';
 $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'] = 'zobrazí fotky v rootu tohoto alba';
 $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 tomto albu';
+$lang['in %d sub-album'] = 'v %d sub-albu';
+$lang['in %d sub-albums'] = 'v %d sub-albech';
 $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 prvky ve všech albech a sub-albech';
 $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'] = 'Poslední alba';
+$lang['display recently updated albums'] = 'zobraz poslední aktualizovaná alba';
 $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'] = 'Hledat v albech';
 $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 sub-albech';
 $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 jako zástupce alba';
 $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'] = 'Album: %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'] = 'Alba výsledky pro';
 $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/cs_CZ/upgrade.lang.php b/language/cs_CZ/upgrade.lang.php
index 056363a02..61237e489 100644
--- a/language/cs_CZ/upgrade.lang.php
+++ b/language/cs_CZ/upgrade.lang.php
@@ -36,7 +36,7 @@ $lang['Only administrator can run upgrade: please sign in below.'] = 'Jen admini
 $lang['You do not have access rights to run upgrade'] = 'nemáte přístupová práva na spuštění upgrade';
 
 // Upgrade informations from upgrade_1.3.1.php
-$lang['All sub-categories of private categories become private'] = 'Všechny pod-ketegorie privátních kategorií se stanou privátními';
+$lang['All sub-albums of private albums become private'] = 'Všechny sub-alba privátních alb zůstanou privatní';
 $lang['User permissions and group permissions have been erased'] = 'Uživatelská oprávnění a oprávnění skupin byla vymazána';
 $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = 'Z předchozí konfigurace byly zachovány pouze předpony náhledů a email adresa správce.';
 
diff --git a/language/de_DE/admin.lang.php b/language/de_DE/admin.lang.php
index 37b58455e..885d38abd 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 Album enthalten';
+$lang['%d albums including'] = '%d Alben 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 Album verschoben';
+$lang['%d albums moved'] = '%d Alben verschoben';
 $lang['%d group'] = '%d Gruppe';
 $lang['%d groups'] = '%d Gruppe';
 $lang['%d member'] = '%d Mitglied';
@@ -57,15 +57,15 @@ $lang['Add group'] = 'Gruppe hinzufügen';
 $lang['Add selected elements to caddie'] = 'Hinzufügen ausgewählter Elemente zum Sammelkorb';
 $lang['Add'] = 'Hinzufügen';
 $lang['Allow user registration'] = 'Erlaube die Neuregistrierung von Benutzern';
-$lang['Apply to subcategories'] = 'Einstellungen auch für Unterkategirien übernehmen';
+$lang['Apply to sub-albums'] = 'Einstellungen auch für Unteralben übernehmen';
 $lang['Associated'] = 'ist verlinkt';
-$lang['Association to categories'] = 'Ist in folgende Kategorien verlinkt';
+$lang['Association to categories'] = 'Ist in folgende Alben verlinkt';
 $lang['Batch management'] = 'Stapelverarbeitung';
 $lang['Caddie management'] = 'Sammelkorb verwalten';
 $lang['Caddie'] = 'Sammelkorb';
-$lang['Categories authorized thanks to group associations'] = 'Für Kategorien freigeschaltet durch Gruppenzugehörigkeit';
-$lang['Categories manual order was saved'] = 'Kategorienreihenfolge gespeichert';
-$lang['Category elements associated to the following categories: %s'] = 'Kategorieelemente zu folgenden Kategorien zugeordnet: %s';
+$lang['Albums authorized thanks to group associations'] = 'Für Alben freigeschaltet durch Gruppenzugehörigkeit';
+$lang['Album manual order was saved'] = 'Albumreihenfolgen wurde gespeichert';
+$lang['Album elements associated to the following albums: %s'] = 'Albumelemente zu folgenden Alben zugeordnet: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'Suche nach einem Upgrade nicht möglich.';
 $lang['Check for upgrade'] = 'Prüfe ob eine neue Version der Bildergalerie verfügbar ist.';
 $lang['Comments for all'] = 'Kommentare für alle erlaubt';
@@ -103,37 +103,37 @@ $lang['Guests'] = 'Gäste';
 $lang['History'] = 'Statistik';
 $lang['Informations'] = 'Kategorieinformation';
 $lang['Install'] = 'Installiere';
-$lang['Link all category elements to a new category'] = 'Verlinkte alle Kategorieelemente zu einer neuen Kategorie';
-$lang['Link all category elements to some existing categories'] = 'Verlinkte alle Kategorieelemente zu einer bestehenden Kategorie';
-$lang['Linked categories'] = 'Verlinkte Kategorie';
+$lang['Link all album elements to a new album'] = 'Verlinkt alle Albumelemente zu einem neuen Album';
+$lang['Link all album elements to some existing albums'] = 'Verlinkt alle Albumelemente zu einem bestehenden Album';
+$lang['Linked albums'] = 'Verlinkter Album';
 $lang['Lock gallery'] = 'Blockiere Schreibzugriffe auf die Datenbank für Wartungsarbeiten';
 $lang['Maintenance'] = 'Wartung';
-$lang['Manage permissions for a category'] = 'Befugnisse für Kategorien verwalten';
+$lang['Edit album permissions'] = 'Befugnisse für ein Album verwalten';
 $lang['Manage permissions for group "%s"'] = 'verwalte Zugriffsrechte für die Gruppe "%s"';
 $lang['Manage permissions for user "%s"'] = 'verwalte Zugriffsrechte für den Benutzer "%s"';
 $lang['Manage tags'] = 'Verwalte Tags';
 $lang['Members'] = 'Mitglieder';
 $lang['Metadata synchronized from file'] = 'Metadaten synchronisiert von Datei';
-$lang['Move categories'] = 'Verschiebe Kategorie';
+$lang['Move albums'] = 'Die Alben verschieben';
 $lang['Move'] = 'Bewege';
 $lang['Name'] = 'Name';
 $lang['New name'] = 'Neuer Name';
-$lang['New parent category'] = 'Neue Oberkategorie';
+$lang['New parent album'] = 'Neuer Vorläuferalbum';
 $lang['New tag'] = 'Neuer Tag';
 $lang['Number of comments per page'] = 'Anzahl von Kommentaren pro Seite';
 $lang['Number of rates'] = 'Anzahl von Bewertungen';
 $lang['Number of thumbnails to create'] = 'Anzahl von zu erstellenden Vorschaubildern';
-$lang['Only private categories are listed'] = 'Nur private Kategorien aufgeführt';
+$lang['Only private albums are listed'] = 'Nur private Alben sind aufgelistet';
 $lang['Operating system'] = 'Betriebssystem';
 $lang['Options'] = 'Optionen';
-$lang['Other private categories'] = 'Andere private Kategorien';
+$lang['Other private albums'] = 'Weitere private Alben';
 $lang['Page banner'] = 'Seitenbanner';
-$lang['Parent category'] = 'übergeordnete Kategorie';
+$lang['Parent album'] = 'Vorläuferalbum';
 $lang['Path'] = 'Pfad';
 $lang['Permalink'] = 'Permalink';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'Permalink %s wurde vorher Kategorie %s zugewiesen. Lösche ihn zuerst aus der History';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'Permalink %s wurde vorher dem Album %s zugewiesen. Lösche ihn zuerst aus der History';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'Ein Permalink darf nur aus folgenden Zeichen bestehen: a-z, A-Z, 0-9, "-" or "_". Er darf nicht nur aus Zahlen bestehen oder mit einer Zahl beginnen mit einem darauffolgenden "-"';
-$lang['Permalink %s is already used by category %s'] = 'Permalink %s wird zur Zeit von Kategorie %s benutzt';
+$lang['Permalink %s is already used by album %s'] = 'Permalink %s wird zurzeit vom Album %s benutzt';
 $lang['Permalink history'] = 'Permalink-Historie';
 $lang['Permalinks'] = 'Permalinks';
 $lang['Permission denied'] = 'Zugriff verweigern';
@@ -151,19 +151,19 @@ $lang['Rating'] = 'Bewertungen';
 $lang['Reject All'] = 'alle abweisen';
 $lang['Reject'] = 'abweisen';
 $lang['Representant'] = 'Vorschaubild';
-$lang['Representation of categories'] = 'Galerievorschaubild';
+$lang['Representation of albums'] = 'Galerievorschaubild';
 $lang['Representative'] = 'Vorschaubild';
 $lang['Represents'] = 'Ist Vorschaubild für diese Kategorien';
 $lang['Save order'] = 'Reihenfolge speichern';
 $lang['Save to permalink history'] = 'Speichere in der Permalink-Historie';
-$lang['Select at least one category'] = 'Mindestens eine Kategorie auswählen';
+$lang['Select at least one album'] = 'Mindestens ein Album auswählen';
 $lang['Select at least one picture'] = 'Mindestens ein Element auswählen';
 $lang['Select at least one user'] = 'Mindestens einen Benutzer auswählen';
 $lang['Show info'] = 'Info anzeigen';
 $lang['Site manager'] = 'Seitenmanager';
 $lang['Status'] = 'Status';
 $lang['Statistics'] = 'Statistik';
-$lang['Storage category'] = 'Speicherkategorie';
+$lang['Storage album'] = 'Speicherung des Albums';
 $lang['Sum of rates'] = 'Summe der Bewertungen';
 $lang['Tag "%s" already exists'] = 'Tag "%s" existiert bereits';
 $lang['Tag "%s" was added'] = 'Tag "%s" wurde hinzugefügt';
@@ -179,32 +179,32 @@ $lang['Validate All'] = 'Gebe alle frei';
 $lang['Validate'] = 'Freigeben';
 $lang['Validation'] = 'Freigabe der Kommentare durch den Admin';
 $lang['Version'] = 'Version';
-$lang['Virtual categories movement'] = 'Verschieben virtueller Kategorien';
-$lang['Virtual categories to move'] = 'Wähle eine oder mehrere Virtuelle Kategorien aus um sie zu verschieben';
-$lang['Virtual category name'] = 'Virtuelle Kategoriename';
+$lang['Virtual categories movement'] = 'Virtuelle Albumen verschieben';
+$lang['Virtual albums to move'] = 'Wähle einen oder mehrere Virtuelle Alben aus um sie zu verschieben';
+$lang['Virtual album name'] = 'Virtueller Albumname';
 $lang['Webmaster cannot be deleted'] = 'Webmaster kann nicht gelöscht werden';
 $lang['You are running on development sources, no check possible.'] = 'Sie benutzen eine Entwicklerversion von Piwigo, es kann keine Suche nach Aktualisierungen vorgenommen werden.';
 $lang['You cannot delete your account'] = "Du kannst deinen eigenen Acount nicht löschen";
-$lang['You cannot move a category in its own sub category'] = 'Sie können eine Kategorie nicht in ihre eigene Unterkategorie verschieben.';
+$lang['You cannot move an album in its own sub album'] = 'Sie können ein Album nicht in seinem eigenen Sub-Album verschieben.';
 $lang['You need to confirm deletion'] = 'Löschen bitte bestätigen';
 $lang['add tags'] = 'Tags hinzufügen';
 $lang['Adviser'] = 'Berater';
-$lang['associate to category'] = 'Mit Kategorie verbinden';
+$lang['Associate to album'] = 'Mit einem Album verbinden';
 $lang['associate to group'] = 'Mit Gruppe verbinden';
 $lang['Authorized'] = 'Freigegebene Kategorien';
-$lang['Add a virtual category'] = 'Virtuelle Kategorie hinzufügen';
-$lang['Authorize users to add comments on selected categories'] = 'Benutzern erlauben, in ausgewählten Kategorien Kommentare zu schreiben';
-$lang['The name of a category should not be empty'] = 'Name der Kategorie darf nicht leer sein.';
-$lang['Lock categories'] = 'Kategorie schließen';
-$lang['Private category'] = 'Private Kategorie';
-$lang['Public category'] = 'öffentliche Kategorie';
+$lang['Add a virtual album'] = 'Virtueller Album hinzufügen';
+$lang['Authorize users to add comments on selected albums'] = 'Benutzern erlauben, in ausgewählten Alben Kommentare zu schreiben';
+$lang['The name of an album must not be empty'] = 'Der Name eines Albums darf nicht leer sein.';
+$lang['Lock albums'] = 'Album schließen';
+$lang['Private'] = 'Privater Album';
+$lang['Public'] = 'Öffentlicher Album';
 $lang['Find a new representant by random'] = 'Bestimme ein neues zufälliges Vorschaubild';
 $lang['Public / Private'] = 'Öffentlich / Privat';
-$lang['Manage authorizations for selected categories'] = 'Berechtigungen für ausgewählte Kategorien verwalten';
-$lang['Select uploadable categories'] = 'gebe Kategorien für den Upload frei';
-$lang['Virtual category added'] = 'Virtuelle Kategorie hinzugefügt';
-$lang['Virtual category deleted'] = 'Virtuelle Kategorie gelöscht';
-$lang['Category'] = 'Kategorie';
+$lang['Manage authorizations for selected albums'] = 'Berechtigungen für ausgewählte Alben verwalten';
+$lang['Select uploadable albums'] = 'Alben auswählen, welche für den Upload freigegeben werden sollen';
+$lang['Virtual album added'] = 'Virtueller Album hinzugefügt';
+$lang['Virtual album deleted'] = 'Virtueller Album entfernt';
+$lang['Album'] = 'Album';
 $lang['Access type'] = 'Zugangsart';
 $lang['Comments'] = 'Benutzerkommentare';
 $lang['Information data registered in database'] = 'Änderungen wurden gespeichert';
@@ -216,11 +216,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = 'Anz
 $lang['Configuration'] = 'Konfiguration';
 $lang['confirm'] = 'bestätigen';
 $lang['Date'] = 'Datum';
-$lang['delete category'] = 'Lösche Kategorie';
-$lang['dissociate from category'] = 'Von Kategorie abtrennen';
+$lang['delete album'] = 'Album löschen';
+$lang['Dissociate from album'] = 'Vom Album abtrennen';
 $lang['dissociate from group'] = 'Von Gruppe abtrennen';
-$lang['edit category permissions'] = 'Berechtigungen für Kategorie ändern';
-$lang['Category informations updated successfully.'] = 'Kategorieinformationen erfolgreich aktualisiert.';
+$lang['edit album permissions'] = 'Albumberechtigungen bearbeiten';
+$lang['Album updated successfully'] = 'Informationen des Albums wurden erfolgreich aktualisiert.';
 $lang['Authorize upload'] = 'Erlaube upload';
 $lang['elements per page'] = 'Elemente pro Seite';
 $lang['elements'] = 'Elemente';
@@ -237,13 +237,13 @@ $lang['group'] = 'Gruppe';
 $lang['The name of a group must not contain " or \' or be empty.'] = 'Der Gruppenname darf kein " oder \' enthalten oder leer bleiben.';
 $lang['This name is already used by another group.'] = 'Diesen Gruppenname gibt es schon.';
 $lang['High definition'] = 'High definition';
-$lang['jump to category'] = 'Gehe zu Kategorie';
+$lang['jump to album'] = 'gehe zum Album';
 $lang['jump to image'] = 'Gehe zu Element';
 $lang['leave'] = 'Beibehalten';
 $lang['Lock'] = 'Schließen';
 $lang['Locked'] = 'Geschlossen';
-$lang['manage category elements'] = 'Kategorieelemente verwalten';
-$lang['manage sub-categories'] = 'Unterkategorien verwalten';
+$lang['manage album elements'] = 'Verwalten Sie die Elemente des Albums';
+$lang['manage sub-albums'] = 'Verwalten Sie die Sub-Alben';
 $lang['Manage'] = 'Verwalten';
 $lang['maximum height'] = 'maximale Höhe';
 $lang['maximum width'] = 'maximale Breite';
@@ -351,15 +351,15 @@ $lang['synchronize'] = 'synchronisieren';
 $lang['update the database from files'] = 'aktualisiert die Datenbank aus den Dateien';
 $lang['status'] = 'Status';
 $lang['Directory'] = 'Verzeichnis';
-$lang['sub-categories'] = 'Unterkategorien';
+$lang['sub-albums'] = 'Sub-Album';
 $lang['synchronize metadata'] = 'Synchronisieren von Meta-Daten';
 $lang['target'] = 'Ziel';
 $lang['Thumbnail'] = 'Thumbnail';
 $lang['title'] = 'Titel';
-$lang['Categories management'] = 'Verwalten von Kategorien';
+$lang['Album list management'] = 'Albumverwaltung';
 $lang['Piwigo configuration'] = 'Konfiguration von Piwigo';
 $lang['Piwigo administration'] = 'Verwaltung von Piwigo';
-$lang['Edit a category'] = 'Bearbeiten einer Kategorie';
+$lang['Edit album'] = 'Einen Album bearbeiten';
 $lang['Group management'] = 'Verwalten von Gruppen';
 $lang['User list'] = 'Liste der Benutzer';
 $lang['Modify informations about a picture'] = 'ändern der Informationen eines Bildes';
@@ -387,12 +387,12 @@ $lang['for this file format'] = 'für dieses Dateiformat';
 $lang['unit mode'] = 'Einzelmodus';
 $lang['Unlocked'] = 'Entsperrt';
 $lang['unset'] = 'Lösche Einstellung';
-$lang['Update categories informations'] = 'Kategorieinformationen aktualisieren';
+$lang['Update albums informations'] = 'Informationen der Alben aktualisieren';
 $lang['Update images informations'] = 'Bildinformationen aktualisieren';
 $lang['Synchronize'] = 'Synchronisieren';
-$lang['reduce to single existing categories'] = 'Auf einzelne bestehende Kategorien reduzieren';
+$lang['reduce to single existing albums'] = 'Auf einzelne bestehende Alben reduzieren';
 $lang['Choose an option'] = 'Eine Option auswählen';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = 'Sämtliche Informationen anzeigen (hinzugefügte Kategorien und Elemente, gelöschte Kategorien und Elemente)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = 'Sämtliche Informationen anzeigen (hinzugefügte Alben und Elemente, gelöschte Alben und Elemente)';
 $lang['Piwigo version differs on the remote site'] = 'PhpWebGallery version unterscheidet sich von der Remote-Seite';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'Die Version von create_listing_file.php auf der Remote-Seite und PhpWebGallery muss die gleiche sein';
 $lang['listing.xml file was not found'] = 'listing.xml Datei nicht gefunden';
@@ -402,14 +402,14 @@ $lang['Errors caption'] = 'Fehlerüberschrift';
 $lang['Detailed informations'] = 'Detallierte Informationen';
 $lang['File/directory read error'] = 'Datei/Ordner Lesefehler';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'Auf diese Datei/Ordner kann nicht zugegriffen werden (Entweder es existiert nicht oder der Zugriff wurde verwehrt)';
-$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'Ein Bild braucht ein Vorschaubild. Das Vorschaubild muß sich im Unterverzeichnis "thumbnail" des Kategorieverzechnisses befinden. Der Dateiname des Vorschaubildes muß mit dem eingestellten Thumbnail-Vorzeichen beginnen und der Dateityp einem der folgenden entsprechen :';
+$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the album directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'Ein Bild braucht ein Vorschaubild. Das Vorschaubild muß sich im Unterverzeichnis "thumbnail" des Kategorieverzechnisses befinden. Der Dateiname des Vorschaubildes muß mit dem eingestellten Thumbnail-Vorzeichen beginnen und der Dateityp einem der folgenden entsprechen :';
 $lang['missing thumbnail'] = 'Fehlendes Thumbnail';
-$lang['categories deleted in the database'] = 'Kategorien in der Datenbank gelöscht';
+$lang['albums deleted in the database'] = 'Alben von der Datenbank entfernt';
 $lang['elements deleted in the database'] = 'Elemente in der Datenbank gelöscht';
 $lang['images candidates for metadata synchronization'] = 'Elemente , deren Metadaten vorhanden sind';
 $lang['elements informations synchronized with files metadata'] = 'Elemente mit der Meta-Datenbank syncronisiert';
 $lang['errors during synchronization'] = 'Fehler während der Synchronisation';
-$lang['categories added in the database'] = 'Kategorien in der Datenbank hinzugefügt';
+$lang['albums added in the database'] = 'Alben in der Datenbank hinzugefügt';
 $lang['elements added in the database'] = 'Elemente in der Datenbank hinzugefügt';
 $lang['elements updated in the database'] = 'Elemente in der Datenbank aktualisiert';
 $lang['Search for new images in the directories'] = 'Suche nach neuen Elementen in den vorhandenen Ordnern';
@@ -434,14 +434,14 @@ $lang['user_status_generic'] = 'Allgemein';
 $lang['user_status_guest'] = 'Gast';
 $lang['user_status_normal'] = 'Besucher';
 $lang['user_status_webmaster'] = 'Webmaster';
-$lang['Virtual category'] = 'Virtuelle Kategorie';
+$lang['Virtual album'] = 'Virteller Album';
 $lang['Waiting'] = 'Wartend auf Freigabe';
 $lang['default'] = 'Standard';
 $lang['Toggle \'default group\' property'] = 'Setze die Einstellungen der Gruppe zurück auf Voreinstellung für alle Benutzer';
 $lang['Advanced features'] = 'Erweiterte Einstellungen';
 $lang['Not linked elements'] = 'Nicht verlinkte Elemente';
 $lang['Specials'] = 'Erweiterte Verwaltung';
-$lang['Files with same name in more than one physical category'] = 'Finde Dateien mit der gleiche Beschreibung';
+$lang['Files with same name in more than one physical album'] = 'Dateien mit dem selben Namen in mehrere physische Alben';
 
 $lang['Overall'] = 'Gesamt';
 $lang['Year'] = 'Jahr';
@@ -460,10 +460,10 @@ $lang['Save page visits by administrators'] = 'Speichere auch Seitenaufrufe des
 $lang['An information email was sent to group "%s"'] = 'Eine Info-E-Mail wurde gesendet an die Gruppe "%s"';
 $lang['Send an information email to group members'] = 'Sende eine Info-E-Mail an die Mitglieder dieser Gruppe';
 $lang['Group'] = 'Gruppe';
-$lang['[%s] Come to visit the category %s'] = '[%s] Es gibt Neues im Bilderordner %s';
+$lang['[%s] Visit album %s'] = '[%s] Besuchen sie den Album %s';
 $lang['Hello,'] = 'Hallo,';
 $lang['See you soon.'] = 'Bis bald.';
-$lang['Come to discover the category:'] = 'Folge dem Link und besuche den Bilderordner:';
+$lang['Discover album:'] = 'Folgen Sie den Link und entdecken Sie den Album:';
 $lang['Mail content'] = 'Text der E-Mail';
 $lang['none'] = 'egal';
 $lang['high'] = 'hoch';
@@ -590,13 +590,13 @@ $lang['Templates configuration has been recorded.'] = 'Die Konfiguration der Tem
 $lang['All optimizations have been successfully completed.'] = 'Alle Optimierungen wurden erfolgreich abgeschlossen.';
 $lang['Optimizations have been completed with some errors.'] = 'Einige Optimierungen endeten mit Fehlern.';
 $lang['Modify information'] = 'Informationen ändern';
-$lang['edit category informations'] = 'Kategorieeigenschaften und -beschreibung bearbeiten';
+$lang['edit album'] = 'Die Albuminformation bearbeiten';
 $lang['nothing'] = 'nichts';
 $lang['overrides existing values with empty ones'] = 'Löscht alle Werte in der Datenbank !!  (filesize, width, height, high_filesize, date_creation, keywords, date_creation, author, name, comment)';
 $lang['manage image ranks'] = 'Verwaltung der Reihenfolge der Bilder';
 $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'] = 'Es befinden sich keine Elemente in diesem Album';
 $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';
@@ -640,18 +640,18 @@ $lang['Forbid this theme to users'] = 'Verbieten Sie dieses Thema den Benutzern'
 $lang['Set as default theme for unregistered and new users'] = 'Setzte als Standartthema für unregistrierte und neue Benutzer';
 $lang['unknown'] = 'unbekannt';
 $lang['Upload Photos'] = 'Lade Fotos hoch';
-$lang['Drop into category'] = 'Ziehe es in die Kategorie';
+$lang['Drop into album'] = 'In den Album ziehen';
 $lang['+ Add an upload box'] = '+ eine weitere Uploadbox';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Erstelle den  "%s" Ordner im Hauptordner (root) deiner Piwigoinstallation';
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Gebe Schreibrechte (chmod 777) dem Ordner "%s" im Hauptordner (root) deiner Piwigoinstallation';
-$lang['existing category'] = 'existierende Kategorie';
-$lang['create a new category'] = 'erstelle eine neue Kategorie';
-$lang['Category name'] = 'Kategoriename';
-$lang['Category "%s" has been added'] = 'Kategorie "%s" wurde hinzugefügt';
+$lang['existing album'] = 'Existierender Album';
+$lang['create a new album'] = 'Ein neues Album erstellen';
+$lang['Album name'] = 'Albumname';
+$lang['Album "%s" has been added'] = 'Kategorie "%s" wurde hinzugefügt';
 $lang['Uploaded Photos'] = 'Lade Fotos hoch';
 $lang['%d photos uploaded'] = '%d Fotos hochgeladen';
 $lang['Privacy level set to "%s"'] = 'Privacy level gesetzt auf "%s"';
-$lang['Category "%s" now contains %d photos'] = 'Kategorie "%s" enthält nun %d Fotos';
+$lang['Album "%s" now contains %d photos'] = 'Kategorie "%s" enthält nun %d Fotos';
 $lang['Manage this set of %d photos'] = 'Verwalte dieses Set von %d Fotos';
 $lang['Select files'] = 'Wähle Dateien aus';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG Dateien oder ZIP Archive, die JPEG Dateien enthalten bitte.';
@@ -678,8 +678,8 @@ $lang['Your configuration settings are saved'] = 'Die Konfigurationseinstellunge
 $lang['Active Themes'] = 'Aktive Themen';
 $lang['Add write access to the "%s" directory'] = 'Gebe dem Ordner "%s" Schreibrechte';
 $lang['Administration Home'] = 'Startseite der Administration';
-$lang['Categories ordered alphanumerically'] = 'Kateorien alphabetisch sortiert';
-$lang['Categories ordered alphanumerically reverse'] = 'Kateorien rückwärts alphabetisch sortiert';
+$lang['Categories ordered alphanumerically'] = 'Alben alphabetisch sortiert';
+$lang['Categories ordered alphanumerically reverse'] = 'Alben rückwärts alphabetisch sortiert';
 $lang['Change Admin Colors'] = 'Ändere die Administrationsfarben ';
 $lang['Delete this theme'] = 'Lösche dieses Thema';
 $lang['Directory does not exist'] = 'Ordner existiert nicht';
diff --git a/language/de_DE/common.lang.php b/language/de_DE/common.lang.php
index b9aa1ae91..ffddd6090 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 Album aktualisiert';
+$lang['%d albums updated'] = '%d Alben aktualisiert';
 $lang['%d comment to validate'] = '%d Kommentar freizuschalten';
 $lang['%d comments to validate'] = '%d Kommentare freizuschalten';
 $lang['%d new comment'] = '%d neuer Kommentar';
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Mindestens eine aufgelis
 $lang['At least one tag must match'] = 'Mindestens ein Tag muss übereinstimmen';
 $lang['Author'] = 'Autor';
 $lang['Average rate'] = 'Durchschnittliche Bewertung';
-$lang['Categories'] = 'Kategorien';
-$lang['Category'] = 'Kategorie';
+$lang['Albums'] = 'Alben';
+$lang['Album'] = 'Album';
 $lang['Close this window'] = 'Dieses Fenster schließen';
 $lang['Complete RSS feed (images, comments)'] = 'RSS-Feeds komplett (Bilder, Kommentare)';
 $lang['Confirm Password'] = 'Neues Passwort bestätigen';
@@ -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 bietet Benachrichtigungen über Events dieser Website an: neue Bilder, Aktualisierungen der Alben, neue Kommentare. Verwendbar durch einen RSS-Feed-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'] = 'Alle Alben ausweiten';
 $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 am Ende dieses Albums an';
 $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 diesem Album';
+$lang['in %d sub-album'] = 'Im %d Sub-Album';
+$lang['in %d sub-albums'] = 'In den %d Sub-Alben';
 $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'] = 'Zeigt alle Elemente in allen Alben und Sub-Alben an';
 $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'] = 'Neueste Alben';
+$lang['display recently updated albums'] = 'Zeigt kürzlich aktualisierte Alben an';
 $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 den Alben';
 $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 den Sub-Alben';
 $lang['searched words : %s'] = 'Suchbegriffe : %s';
 $lang['Contact'] = 'Kontakt';
-$lang['set as category representative'] = 'Als Vorschaubild dieser Kategorie';
+$lang['set as album representative'] = 'Als repräsentativer Album setzen';
 $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'] = 'Album: %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'] = 'Albumresultate 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/de_DE/upgrade.lang.php b/language/de_DE/upgrade.lang.php
index 747199b68..c4213ed37 100644
--- a/language/de_DE/upgrade.lang.php
+++ b/language/de_DE/upgrade.lang.php
@@ -31,7 +31,7 @@ $lang['Upgrade informations'] = 'Upgrade Informationen';
 $lang['Perform a maintenance check in [Administration>Tools>Maintenance] if you encounter any problem.'] = 'Führen Sie eine Datenbanküberprüfung durch in [Verwaltung>Werkzeuge>Wartung] falls ein Problem auftritt.';
 $lang['Only administrator can run upgrade: please sign in below.'] = 'Nur Administratoren dürfen ein Upgrade durchführen. Bitte loggen Sie sich ein';
 $lang['You do not have access rights to run upgrade'] = 'Sie haben nicht die erforderlichen Rechte ein Upgrade durchzuführen';
-$lang['All sub-categories of private categories become private'] = 'Alle Unterkategorien von privaten Kategorien bekommen den Status "private Kategorie"';
+$lang['All sub-albums of private albums become private'] = 'Alle Sub-Alben von privaten Alben werden auch privat eigestellt';
 $lang['User permissions and group permissions have been erased'] = 'Alle Benutzer- und Gruppenberechtigungen/beschränkungen wurden entfernt';
 $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = 'Es wurden nur die Thumbnail-Präfixe und die Mailadresse des Webmasters übernommen';
 $lang['This page proposes to upgrade your database corresponding to your old version of Piwigo to the current version. The upgrade assistant thinks you are currently running a <strong>release %s</strong> (or equivalent).'] = 'Diese Seite hat vor, Ihre Datenbank entsprechend Ihrer alten Version von Piwigo zur gegenwärtigen Version zu aktualisieren.
diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php
index 512046645..4787b9a97 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 àlbum dont';
+$lang['%d albums including'] = '%d àlbumes dont';
 $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 àlbum movido';
+$lang['%d albums moved'] = '%d àlbumes movidos';
 $lang['%d group'] = '%d grupo';
 $lang['%d groups'] = '%d grupos';
 $lang['%d member'] = '%d miembro';
@@ -57,15 +57,15 @@ $lang['Add group'] = 'Añadir un grupo';
 $lang['Add selected elements to caddie'] = 'Añadir los elementos seleccionados a la cesta';
 $lang['Add'] = 'Subir';
 $lang['Allow user registration'] = 'Permitir el registro de los usuarios';
-$lang['Apply to subcategories'] = 'Aplicar a subcategorías';
+$lang['Apply to sub-albums'] = 'Appliquer a los sub-àlbumes';
 $lang['Associated'] = 'Asociada a';
-$lang['Association to categories'] = 'Asociación a las categorías';
+$lang['Association to categories'] = 'Association aux àlbumes';
 $lang['Batch management'] = 'Gestión por lote';
 $lang['Caddie management'] = 'Gestión de la cesta';
 $lang['Caddie'] = 'Cesta';
-$lang['Categories authorized thanks to group associations'] = 'Categorías accesibles gracias a la pertenencia a los grupos';
-$lang['Categories manual order was saved'] = 'La orden manual de las categorías ha sido salvaguardada';
-$lang['Category elements associated to the following categories: %s'] = 'Los elementos de la categoría han sido asociados con las categorías siguientes : %s';
+$lang['Albums authorized thanks to group associations'] = 'Albums accessibles grâce à l\'appartenance aux groupes';
+$lang['Album manual order was saved'] = 'El orden manual de los albumes se guardo con exito';
+$lang['Album elements associated to the following albums: %s'] = 'Les fotos del àlbum fueron asociados a los àlbumes siguientes : %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'La comprobación de la última versión sobre el servidor fue suspendida por una razón desconocida.';
 $lang['Check for upgrade'] = 'Última versión';
 $lang['Comments for all'] = 'Comentarios para todos';
@@ -103,37 +103,37 @@ $lang['Guests'] = 'Invitados';
 $lang['History'] = 'histórico';
 $lang['Informations'] = 'Informaciones';
 $lang['Install'] = 'Instalar';
-$lang['Link all category elements to a new category'] = 'Vincular todos los elementos de la categoría con una nueva categoría';
-$lang['Link all category elements to some existing categories'] = 'Vincular todos los elementos de la categoría existentes';
-$lang['Linked categories'] = 'Categorías asociadas';
+$lang['Link all album elements to a new album'] = 'Asociar  todas las fotos del àlbum a un nuevo àlbum';
+$lang['Link all album elements to some existing albums'] = 'Asociar  todas las fotos del àlbum a los àlbumes existantes';
+$lang['Linked albums'] = 'Albums asociados';
 $lang['Lock gallery'] = 'Cerrar la galería';
 $lang['Maintenance'] = 'Mantenimiento';
-$lang['Manage permissions for a category'] = 'Administrar las autorizaciones para una categoría';
+$lang['Edit album permissions'] = 'Administrar los derechos de un àlbum';
 $lang['Manage permissions for group "%s"'] = 'Administrar las autorizaciones para el grupo "%s"';
 $lang['Manage permissions for user "%s"'] = 'Administrar las autorizaciones para el usuario "%s"';
 $lang['Manage tags'] = 'Administrar las etiquetas';
 $lang['Members'] = 'Miembros';
 $lang['Metadata synchronized from file'] = 'Meta-datos sincronizadas a partir del fichero';
-$lang['Move categories'] = 'Desplazar las categorías';
+$lang['Move albums'] = 'Mover los àlbumes';
 $lang['Move'] = 'Desplazar';
 $lang['Name'] = 'Nombre';
 $lang['New name'] = 'Nuevo nombre';
-$lang['New parent category'] = 'Nueva categoría pariente';
+$lang['New parent album'] = 'Nuevo àlbum parent';
 $lang['New tag'] = 'Nueva etiqueta';
 $lang['Number of comments per page'] = 'Número de comentarios por página';
 $lang['Number of rates'] = 'Número de notas';
 $lang['Number of thumbnails to create'] = 'Número de miniaturas que hay que crear';
-$lang['Only private categories are listed'] = 'Sólo las categorías particulares son puestas en una lista';
+$lang['Only private albums are listed'] = 'Listado de los abulmes privados';
 $lang['Operating system'] = 'Systema operativo';
 $lang['Options'] = 'Opciones';
-$lang['Other private categories'] = 'Otras categorías particulares';
+$lang['Other private albums'] = 'Otros àlbumes privados';
 $lang['Page banner'] = 'Bandera de las páginas';
-$lang['Parent category'] = 'Categoría pariente';
+$lang['Parent album'] = 'Album parent';
 $lang['Path'] = 'Camino';
 $lang['Permalink'] = 'Enlace permanente';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'El enlace permanente %s ha sido utilizado anteriormente por la categoría %s. Por favor, bórrelo del histórico de los enlaces permanentes';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'El enlace permanente %s se utilizo par elàlbum %s. Borrarlo del historico de los enlaces permanentes';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'El enlace permanente debe contener sólo carácteres entre " - zA-Z0-9 ", "-" o "_". No debe ser numérico o comenzar con un número seguido por "-"';
-$lang['Permalink %s is already used by category %s'] = 'El enlace permanente %s es ya utilizado por la categoría %s';
+$lang['Permalink %s is already used by album %s'] = 'El enlace permanente %s ya se utilizo par el àlbum %s';
 $lang['Permalink history'] = 'Histórico de los enlaces permanentes';
 $lang['Permalinks'] = 'Enlaces permanentes';
 $lang['Permission denied'] = 'Acceso prohibido';
@@ -151,19 +151,19 @@ $lang['Rating'] = 'Notación';
 $lang['Reject All'] = 'Rechazar todo';
 $lang['Reject'] = 'Rechazar';
 $lang['Representant'] = 'Representante';
-$lang['Representation of categories'] = 'Representación de las categorías';
+$lang['Representation of albums'] = 'Représentacion de los àlbumes';
 $lang['Representative'] = 'Representante';
 $lang['Represents'] = 'Representa';
 $lang['Save order'] = 'Salvaguardar la orden';
 $lang['Save to permalink history'] = 'Salvaguardar en el histórico de los enlaces permanentes';
-$lang['Select at least one category'] = 'Seleccionar por lo menos una categoría';
+$lang['Select at least one album'] = 'seleccionar al minimo un àlbum';
 $lang['Select at least one picture'] = 'Seleccionar por lo menos una imagen';
 $lang['Select at least one user'] = 'Seleccionar por lo menos a un usuario';
 $lang['Show info'] = 'Mostrar las informaciones';
 $lang['Site manager'] = 'Gestion de sitios';
 $lang['Status'] = 'Estatuto';
 $lang['Statistics'] = 'Estadísticas';
-$lang['Storage category'] = 'Categoría de almacenamiento';
+$lang['Storage album'] = 'Album de stockage';
 $lang['Sum of rates'] = 'Suma de las notas';
 $lang['Tag "%s" already exists'] = 'La etiqueta "%s" ya existe';
 $lang['Tag "%s" was added'] = 'La etiqueta "%s" ha sido añadida';
@@ -179,32 +179,32 @@ $lang['Validate All'] = 'Validar todo';
 $lang['Validate'] = 'Validar';
 $lang['Validation'] = 'Validación';
 $lang['Version'] = 'Versión';
-$lang['Virtual categories movement'] = 'Desplazamiento de categorías virtuales';
-$lang['Virtual categories to move'] = 'Categorías virtuales que hay que desplazar';
-$lang['Virtual category name'] = 'Nombre de la categoría virtual';
+$lang['Virtual categories movement'] = 'Movida de los àlbumes virtuales';
+$lang['Virtual albums to move'] = 'Albums virtuales para mover';
+$lang['Virtual album name'] = 'Nombre del àlbum virtual';
 $lang['Webmaster cannot be deleted'] = 'El webmestre no puede ser suprimido';
 $lang['You are running on development sources, no check possible.'] = 'Usted trabaja con las fuentes de desarrollo, imposible verificar la última versión.';
 $lang['You cannot delete your account'] = "Usted no puede suprimir su cuenta";
-$lang['You cannot move a category in its own sub category'] = 'Usted no puede desplazar una categoría en su propia subcategoría';
+$lang['You cannot move an album in its own sub album'] = 'No se puede mover un àlbum en  su proprio sub-àlbum';
 $lang['You need to confirm deletion'] = 'Usted debe confirmar la supresión';
 $lang['add tags'] = 'Añadir las etiquetas';
 $lang['Adviser'] = 'Consejero';
-$lang['associate to category'] = 'asociar con la categoría';
+$lang['Associate to album'] = 'Asociar al àlbum';
 $lang['associate to group'] = 'asociar con grupo';
 $lang['Authorized'] = 'Autorizados';
-$lang['Add a virtual category'] = 'Añadir una categoría virtual';
-$lang['Authorize users to add comments on selected categories'] = 'Autorizar a los usuarios a añadir comentarios en las categorías seleccionadas';
-$lang['The name of a category should not be empty'] = 'El nombre de la categoría no debe estar vacío';
-$lang['Lock categories'] = 'Cerrar las categorías';
-$lang['Private category'] = 'Categoría particular';
-$lang['Public category'] = 'Categoría pública';
+$lang['Add a virtual album'] = 'Agregar un àlbum virtual';
+$lang['Authorize users to add comments on selected albums'] = 'Autorizar los usuarios à añadir commentarios a los àlbumes sélectionados';
+$lang['The name of an album must not be empty'] = 'El nombre del àlbum no se puede quedar vacio';
+$lang['Lock albums'] = 'Bloquear los àlbumes';
+$lang['Private'] = 'Album privado';
+$lang['Public'] = 'Album publico';
 $lang['Find a new representant by random'] = 'Encontrar a un nuevo representante al azar';
 $lang['Public / Private'] = 'Pública / Privada';
-$lang['Manage authorizations for selected categories'] = 'Administrar el tipo de acceso para las categorías seleccionadas';
-$lang['Select uploadable categories'] = 'Seleccionar las categorías autorizadas al añadido';
-$lang['Virtual category added'] = 'Categoría virtual añadida';
-$lang['Virtual category deleted'] = 'Categoría virtual suprimida';
-$lang['Category'] = 'Categoría';
+$lang['Manage authorizations for selected albums'] = 'Administrar los acesos para los àlbumes selectionados';
+$lang['Select uploadable albums'] = 'seleccionar los àlbumes autorizados a sumar';
+$lang['Virtual album added'] = 'Album virtual añadido';
+$lang['Virtual album deleted'] = 'Album virtual borrado';
+$lang['Album'] = 'Álbum';
 $lang['Access type'] = 'Tipo de acceso';
 $lang['Comments'] = 'Comentarios';
 $lang['Information data registered in database'] = 'Informaciones registradas en la base de datos';
@@ -216,11 +216,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = 'El
 $lang['Configuration'] = 'Configuración';
 $lang['confirm'] = 'Confirmar';
 $lang['Date'] = 'del dia';
-$lang['delete category'] = 'Suprimir la categoría';
-$lang['dissociate from category'] = 'Disociar de la categoría';
+$lang['delete album'] = 'borrar el àlbum';
+$lang['Dissociate from album'] = 'Separar del àlbum';
 $lang['dissociate from group'] = 'Disociar del grupo';
-$lang['edit category permissions'] = 'Modificar los permisos de la categoría';
-$lang['Category informations updated successfully.'] = 'Las informaciones de la categoría han sido actualizadas con éxito.';
+$lang['edit album permissions'] = 'Modificar los permisos del àlbum';
+$lang['Album updated successfully'] = 'Les informationes del àlbum se actualizaron con exito.';
 $lang['Authorize upload'] = 'Autorizar el añadido de imágenes';
 $lang['elements per page'] = 'Elementos por página';
 $lang['elements'] = 'Elementos';
@@ -238,13 +238,13 @@ $lang['The name of a group must not contain " or \' or be empty.'] = 'El nombre
 $lang['This name is already used by another group.'] = 'Este nombre es ya utilizado por otro grupo.';
 $lang[''] = '';
 $lang['High definition'] = 'Alta definición';
-$lang['jump to category'] = 'Ir en la categoría';
+$lang['jump to album'] = 'Ir al àlbum';
 $lang['jump to image'] = 'Ir a la imagen';
 $lang['leave'] = 'dejar';
 $lang['Lock'] = 'Cerrar';
 $lang['Locked'] = 'Cerrado';
-$lang['manage category elements'] = 'administrar los elementos de la categoría';
-$lang['manage sub-categories'] = 'administrar las subcategorías';
+$lang['manage album elements'] = 'Administrar los élémentos del àlbum';
+$lang['manage sub-albums'] = 'Administrar los sub-àlbumes';
 $lang['Manage'] = 'Administrar';
 $lang['maximum height'] = 'Altura máxima';
 $lang['maximum width'] = 'Ancho máxima';
@@ -353,15 +353,15 @@ $lang['synchronize'] = 'Sincronizar';
 $lang['update the database from files'] = 'actualizar la base de datos a partir de los ficheros';
 $lang['status'] = 'Estatuto';
 $lang['Directory'] = 'Repertorio';
-$lang['sub-categories'] = 'subcategorías';
+$lang['sub-albums'] = 'sub-àlbumes';
 $lang['synchronize metadata'] = 'Sincronizar los méta-datos';
 $lang['target'] = 'blanco';
 $lang['Thumbnail'] = 'miniatura';
 $lang['title'] = 'título';
-$lang['Categories management'] = 'Gestión de las categorías';
+$lang['Album list management'] = 'Gestion de los àlbumes';
 $lang['Piwigo configuration'] = 'Configuración de Piwigo';
 $lang['Piwigo administration'] = 'Administración de Piwigo';
-$lang['Edit a category'] = 'Modificar una categoría';
+$lang['Edit album'] = 'Modificar un àlbum';
 $lang['Group management'] = 'Gestión de los grupos';
 $lang['User list'] = 'Lista usuarios';
 $lang['Modify informations about a picture'] = 'Modificar las informaciones de una imagen';
@@ -389,12 +389,12 @@ $lang['for this file format'] = 'para este tamaño de fichero';
 $lang['unit mode'] = 'modo unitario';
 $lang['Unlocked'] = 'quitado el cierre';
 $lang['unset'] = 'Vaciar';
-$lang['Update categories informations'] = 'Actualizar las informaciones de las categorías';
+$lang['Update albums informations'] = 'Actualizar las informaciones de los àlbumes';
 $lang['Update images informations'] = 'Actualizar las informaciones de las imágenes';
 $lang['Synchronize'] = 'Sincronizar';
-$lang['reduce to single existing categories'] = 'Únicamente tratar una categoría';
+$lang['reduce to single existing albums'] = 'Traitar solo un àlbum';
 $lang['Choose an option'] = 'Escoger una opción';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = 'Visualizar un máximo de informaciones (categorías añadidas, elementos añadidos, categorías y elementos suprimidos)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = 'Monstrar todas las informaciones (àlbumes añadidos, fotos añadidas, àlbumes y fotos borrados)';
 $lang['Piwigo version differs on the remote site'] = 'La versión Piwigo sobre el sitio distante es diferente';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'La versión de create_listing_file.php sobre el sitio distante y Piwigo deben ser los mismos';
 $lang['listing.xml file was not found'] = 'El fichero listing.xml es imposible de encontrar';
@@ -404,14 +404,14 @@ $lang['Errors caption'] = 'Leyenda de los errores';
 $lang['Detailed informations'] = 'Informaciones detalladas';
 $lang['File/directory read error'] = 'Error de abertura fichero / repertorio';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'El fichero o el repertorio no puede ser accesible (o sea no existe, o sea el acceso esta negado)';
-$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'Cada fichero con imágenes requiere una miniatura. La miniatura debe estar presente en el subdirectorio " thumbnail " del repertorio de la categoría. El nombre del fichero de la miniatura debe comenzar con parámetro de configuración "prefix_thumbnail" y la extensión del nombre del fichero debe estar entre la lista siguiente:';
+$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the album directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'Cada foto necesita une miniatura. La miniature debe estar presente en el sub-repertorio \"thumbnail\" del répertorio del àlbum. El nombre del archivo de la  miniatura debe empezar con el parametro de configuration \"prefix_thumbnail\" y la extension del nombre del archivo debe aparecer en esta lista :';
 $lang['missing thumbnail'] = 'falta la miniatura ';
-$lang['categories deleted in the database'] = 'categorías suprimidas de la base de datos';
+$lang['albums deleted in the database'] = 'àlbumes borrados de la base de datos';
 $lang['elements deleted in the database'] = 'Elementos suprimidos de la base de datos';
 $lang['images candidates for metadata synchronization'] = 'Imágenes candidatas a la sincronización con los méta-datos';
 $lang['elements informations synchronized with files metadata'] = 'Informaciones de las imágenes sincronizadas con los méta-datos';
 $lang['errors during synchronization'] = 'errores sobrevenidos durante la sincronización';
-$lang['categories added in the database'] = 'categorías añadidas a la base de datos';
+$lang['albums added in the database'] = 'àlbumes añadidos a la base de datos';
 $lang['elements added in the database'] = 'elementos añadidos a la base de datos';
 $lang['elements updated in the database'] = 'elementos actualizados en la base de datos';
 $lang['Search for new images in the directories'] = 'Buscar las nuevas imágenes en los repertorios';
@@ -436,14 +436,14 @@ $lang['user_status_generic'] = 'Genérico';
 $lang['user_status_guest'] = 'Invitado';
 $lang['user_status_normal'] = 'Visitante';
 $lang['user_status_webmaster'] = 'Webmestre';
-$lang['Virtual category'] = 'Categoría virtual';
+$lang['Virtual album'] = 'Album virtual';
 $lang['Waiting'] = 'En espera';
 $lang['default'] = 'por defecto';
 $lang['Toggle \'default group\' property'] = 'Invertir la propiedad \'grupo por defecto\'';
 $lang['Advanced features'] = 'Funciones avanzadas';
 $lang['Not linked elements'] = 'Elementos no atados';
 $lang['Specials'] = 'Especiales';
-$lang['Files with same name in more than one physical category'] = 'Archivos con el mismo nombre en varios àlbumes fisicos';
+$lang['Files with same name in more than one physical album'] = 'Archivos con el mismo nombre en varios àlbumes physicos';
 $lang['Overall'] = 'Vista global';
 $lang['Year'] = 'Año';
 $lang['Month'] = 'Mes';
@@ -461,10 +461,10 @@ $lang['Save page visits by administrators'] = 'Registrar las páginas visitadas
 $lang['An information email was sent to group "%s"'] = 'Un mail de informacion ha sido enviado a los miembros del grupo "%s"';
 $lang['Send an information email to group members'] = 'Enviar un mail de informacion a los miembros de un grupo';
 $lang['Group'] = 'Groupo';
-$lang['[%s] Come to visit the category %s'] = '[%s] Venga a visitar la categoría %s';
+$lang['[%s] Visit album %s'] = '[%s] Visitar el àlbum %s';
 $lang['Hello,'] = 'Buenos días,';
 $lang['See you soon.'] = 'Hasta pronto.';
-$lang['Come to discover the category:'] = 'Venga a descubrir la categoría:';
+$lang['Discover album:'] = 'Conocer el àlbum:';
 $lang['Mail content'] = 'Contenido del mail';
 $lang['none'] = 'Ninguno';
 $lang['high'] = 'alto';
@@ -589,13 +589,13 @@ $lang['Templates configuration has been recorded.'] = 'La configuración del tem
 $lang['All optimizations have been successfully completed.'] = 'Todas las optimizaciones han sido realizadas con éxito.';
 $lang['Optimizations have been completed with some errors.'] = 'Ciertas optimizaciones se acabaron con errores.';
 $lang['Modify information'] = 'Modificar las informaciones';
-$lang['edit category informations'] = 'editar las informaciones de esta categoría';
+$lang['edit album'] = 'editar las informationes de este àlbum';
 $lang['nothing'] = 'nada';
 $lang['overrides existing values with empty ones'] = 'Reemplazar los valores existentes con vacíos';
 $lang['manage image ranks'] = 'Administrar el orden de las imágenes';
 $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 élémento en este àlbum';
 $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';
@@ -638,18 +638,18 @@ $lang['Forbid this theme to users'] = 'Prohibirles este tema a los usuarios';
 $lang['Set as default theme for unregistered and new users'] = 'Tema por defecto para los invitados y los nuevos usuarios';
 $lang['unknown'] = 'desconocido';
 $lang['Upload Photos'] = 'Agregar fotos';
-$lang['Drop into category'] = 'Poner en una categoría';
+$lang['Drop into album'] = 'Pegar en un àlbum';
 $lang['+ Add an upload box'] = '+ Añadir otra caja de transferencia';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Cree el repertorio "%s" en la raíz de su instalación Piwigo';
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Dé los autorizaciones en escritura (chmod 777) al repertorio "%s"  en la raíz de su instalación Piwigo';
-$lang['existing category'] = 'categoría existente';
-$lang['create a new category'] = 'crear una nueva categoría';
-$lang['Category name'] = 'Nombre de la categoría';
-$lang['Category "%s" has been added'] = 'La categoría "%s" ha sido añadida';
+$lang['existing album'] = 'àlbum existante';
+$lang['create a new album'] = 'crear un àlbum nuevo';
+$lang['Album name'] = 'Nombre del àlbum';
+$lang['Album "%s" has been added'] = 'el àlbum "%s" esta añadido';
 $lang['Uploaded Photos'] = 'Fotos añadidas';
 $lang['%d photos uploaded'] = '%d fotos añadidas';
 $lang['Privacy level set to "%s"'] = 'Nivel de confidencialidad "%s"';
-$lang['Category "%s" now contains %d photos'] = 'La categoría "%s"  contiene en lo sucesivo %d fotos';
+$lang['Album "%s" now contains %d photos'] = 'EL àlbum "%s" ahora lleva %d fotos';
 $lang['Manage this set of %d photos'] = 'Administrar este lote de %d fotos';
 $lang['Select files'] = 'Escoger ficheros';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'Ficheros JPEG o archivas ZIP que contiene ficheros JPEG por favor.';
@@ -676,8 +676,8 @@ $lang['Your configuration settings are saved'] = 'Sus parámetros de configuraci
 $lang['Active Themes'] = 'Temas activadas';
 $lang['Add write access to the "%s" directory'] = 'Añada el acceso en escritura para el repertorio';
 $lang['Administration Home'] = 'Administración';
-$lang['Categories ordered alphanumerically'] = 'Categorías escogidos por orden alfanumérico';
-$lang['Categories ordered alphanumerically reverse'] = 'Categorías escogidos por orden alfanumérico inverso';
+$lang['Categories ordered alphanumerically'] = 'Albums ordenados por orden alfabetico';
+$lang['Categories ordered alphanumerically reverse'] = 'Albums ordenados par ordre alfabetico inverso';
 $lang['Change Admin Colors'] = 'Modificar los colores de la administración';
 $lang['Delete this theme'] = 'Suprimir este tema';
 $lang['Directory does not exist'] = 'El repertorio no existe';
diff --git a/language/es_ES/common.lang.php b/language/es_ES/common.lang.php
index a3b7a2d25..adcf7c6ba 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 àlbum actualizado';
+$lang['%d albums updated'] = '%d àlbumes actualizados';
 $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';
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Debe elegir al menos una
 $lang['At least one tag must match'] = 'Debe coincidir al menos una de las etiquetas';
 $lang['Author'] = 'Autor';
 $lang['Average rate'] = 'Valoración promedio';
-$lang['Categories'] = 'Categorías';
-$lang['Category'] = 'Categoría';
+$lang['Albums'] = 'Albums';
+$lang['Album'] = 'Álbum';
 $lang['Close this window'] = 'Cerrar la ventana';
 $lang['Complete RSS feed (images, comments)'] = 'Flujo RSS completo (imágenes, comentarios)';
 $lang['Confirm Password'] = 'Confirmar la contraseña';
@@ -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.'] = 'El flujo RSS notifica los eventos de la galeria : fotos nuevas, àlbumes actualizados, nuevos comentarios usuario. Para utilizar con un lecteur de flujo RSS.';
 $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'] = 'Ver todos los àlbumes';
 $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'] = 'monstrar las fotos a la raice de este àlbum';
 $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 este àlbum';
+$lang['in %d sub-album'] = 'en este %d sub-àlbum';
+$lang['in %d sub-albums'] = 'en estos %d sub-àlbumes';
 $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'] = 'Ancho 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 subida';
-$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'] = 'Ver todas las fotos de los abumes y sub-albumes';
 $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'] = 'Albums récents';
+$lang['display recently updated albums'] = 'Ver los àlbumes recien creados o actualizados';
 $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 en los àlbumes';
 $lang['Search by Date'] = 'Buscar por fecha';
 $lang['Date'] = 'del dia';
 $lang['End-Date'] = 'Hasta el dia';
@@ -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 los sub-àlbumes';
 $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 como cabeza de este àlbum';
 $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'] = 'Album : %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'] = 'Résultados de los  àlbumes por';
 $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/es_ES/upgrade.lang.php b/language/es_ES/upgrade.lang.php
index 0fa9a1d40..f0f69c46b 100644
--- a/language/es_ES/upgrade.lang.php
+++ b/language/es_ES/upgrade.lang.php
@@ -34,7 +34,7 @@ $lang['Only administrator can run upgrade: please sign in below.'] = 'Sólo un a
 $lang['You do not have access rights to run upgrade'] = 'Usted no tiene los derechos necessaires para lanzar la actualización.';
 
 // Upgrade informations from upgrade_1.3.1.php
-$lang['All sub-categories of private categories become private'] = 'Todas las subcategorías de categorías privadas se vuelven privadas';
+$lang['All sub-albums of private albums become private'] = 'Todos los sub-àlbumes de los àlbumes privados son privados';
 $lang['User permissions and group permissions have been erased'] = 'Las autorizaciones de los usuarios y de los grupos han sido borradas';
 $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = 'Sólo el prefijo de las miniaturas y el email  del webmestre han sido salvaguardados por la configuración precedente';
 
diff --git a/language/lv_LV/admin.lang.php b/language/lv_LV/admin.lang.php
index 84181bdaa..121072d9e 100644
--- a/language/lv_LV/admin.lang.php
+++ b/language/lv_LV/admin.lang.php
@@ -23,12 +23,12 @@
 
 $lang['%d association'] = '%d kopa';
 $lang['%d associations'] = '%d kopas';
-$lang['%d category including'] = '%d kategorija pievienota';
-$lang['%d categories including'] = '%d kategorijas pievienotas';
+$lang['%d album including'] = '%d albūmu ieskaitot';
+$lang['%d albums including'] = '%d albūmus ieskaitot';
 $lang['%d physical'] = ' %d reālas';
 $lang[' and %d virtual'] = ' un %d virtuālas';
-$lang['%d category moved'] = '%d kategorija pārvietota';
-$lang['%d categories moved'] = '%d kategorijas pārvietotas';
+$lang['%d album moved'] = '%d albūms pārvietots';
+$lang['%d albums moved'] = '%d albūmi pārvietoti';
 $lang['%d group'] = '%d grupa';
 $lang['%d groups'] = '%d grupas';
 $lang['%d member'] = '%d biedrs';
@@ -55,15 +55,15 @@ $lang['Add group'] = 'Pievienot grupu';
 $lang['Add selected elements to caddie'] = 'Pievienot izvēlētos elementus grozam';
 $lang['Add'] = 'Pievienot';
 $lang['Allow user registration'] = 'Atļaut reģistrēt lietotāju';
-$lang['Apply to subcategories'] = 'Pielietot apakškategorijām';
+$lang['Apply to sub-albums'] = 'Pielietot apakšalbūmiem';
 $lang['Associated'] = 'Saistītas';
-$lang['Association to categories'] = 'Saistība ar kategorijām';
+$lang['Association to categories'] = 'Saistībā ar albūmiem';
 $lang['Batch management'] = 'Pakešveida apstrāde';
 $lang['Caddie management'] = 'Groza pārvaldīšana';
 $lang['Caddie'] = 'Grozs';
-$lang['Categories authorized thanks to group associations'] = 'Kategorijas, kas atļautas pateicoties saistībai grupu' ;
-$lang['Categories manual order was saved'] = 'Kategoriju sevišķā kārtība saglabāta';
-$lang['Category elements associated to the following categories: %s'] = 'Kategorijas attēli sasaistīti ar sekojošām kategorijām: %s';
+$lang['Albums authorized thanks to group associations'] = 'Albūmi autorizēti dēļ grupu apvienībēm';
+$lang['Album manual order was saved'] = 'Albūmu kārtība saglabāta';
+$lang['Album elements associated to the following albums: %s'] = 'Albūma attēli saistīti ar sekojošiem albūmiem: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'Pārbaude pēc uzlabojuma nezināmu iemeslu dēļ nav izdevusies.';
 $lang['Check for upgrade'] = 'Pārbaudīt uzlabojumu';
 $lang['Comments for all'] = 'Komentāri visiem';
@@ -101,37 +101,37 @@ $lang['Guests'] = 'Viesi';
 $lang['History'] = 'Vēsture';
 $lang['Informations'] = 'Informācija';
 $lang['Install'] = 'Instalēt';
-$lang['Link all category elements to a new category'] = 'Sasaistīt visus šīs kategorijas elementus ar jauno kategoriju';
-$lang['Link all category elements to some existing categories'] = 'Sasaistīt visus šīs kategorijas elementus ar kādu no esošajām kategorijām';
-$lang['Linked categories'] = 'Saistītās kategorijas';
+$lang['Link all album elements to a new album'] = 'Sasaistīt visus albūma attēlus ar jauno albūmu';
+$lang['Link all album elements to some existing albums'] = 'Sasaistīt visus albūma attēlus ar jau esošajiem albūmiem';
+$lang['Linked albums'] = 'Sasaistītie albūmi';
 $lang['Lock gallery'] = 'Bloķēt galeriju';
 $lang['Maintenance'] = 'Apkope';
-$lang['Manage permissions for a category'] = 'Pārvaldīt kategoriju atļaujas';
+$lang['Edit album permissions'] = 'Pārvaldīt albūma atļaujas';
 $lang['Manage permissions for group "%s"'] = 'Pārvaldīt "%s" grupas atļaujas';
 $lang['Manage permissions for user "%s"'] = 'Pārvaldīt lietotāja "%s" atļaujas';
 $lang['Manage tags'] = 'Pārvaldīt iezīmes';
 $lang['Members'] = 'Biedri';
 $lang['Metadata synchronized from file'] = 'Metadati no faila sinhronizēti';
-$lang['Move categories'] = 'Pārvietot kategorijas';
+$lang['Move albums'] = 'Pārvietot albūmus';
 $lang['Move'] = 'Pārvietot';
 $lang['Name'] = 'Nosaukums';
 $lang['New name'] = 'Jauns nosaukums';
-$lang['New parent category'] = 'Jauna pirmavota kategorija';
+$lang['New parent album'] = 'Jauns pamatalbūms';
 $lang['New tag'] = 'Jauna iezīme';
 $lang['Number of comments per page'] = 'Komentāru skaits lapā';
 $lang['Number of rates'] = 'Vērtējumu skaits';
 $lang['Number of thumbnails to create'] = 'Izveidojamo piktogrammu skaits';
-$lang['Only private categories are listed'] = 'Tiek rādītas tikai privātās kategorijas';
+$lang['Only private albums are listed'] = 'Tiek rādīti tikai privātie albūmi';
 $lang['Operating system'] = 'Operacionālā sistēma';
 $lang['Options'] = 'Izvēles';
-$lang['Other private categories'] = 'Citas privātās kategorijas';
+$lang['Other private albums'] = 'Citi privātie albūmi';
 $lang['Page banner'] = 'Lapas baneris';
-$lang['Parent category'] = 'Pirmavota kategorija';
+$lang['Parent album'] = 'Pamatalbūms';
 $lang['Path'] = 'Ceļš';
 $lang['Permalink'] = 'Pamatsaite';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'Pamatsaiti %s iepriekš izmantoja %s kategorija. vispirms izdzēsiet to no pamatsaišu vēstures';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'Pirmsaiti %s iepriekš lietoja albūms %s. Vispirms izdzēsiet to no pirmsašu vēstures';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'Pamatsaites nosaukums drīkst saturēt a-z, A-Z, 0-9, "-", "_" or "/". Tas nedrīkst būt tikai skaitlis vai sākties ar ciparu, kam seko "-"';
-$lang['Permalink %s is already used by category %s'] = 'Pamatsaiti %s jau lieto kategorija %s';
+$lang['Permalink %s is already used by album %s'] = 'Pirmsaiti %s jau lieto albūms %s';
 $lang['Permalink history'] = 'Pamatsaišu vēsture';
 $lang['Permalinks'] = 'Pamatsaites';
 $lang['Permission denied'] = 'Piekļuve liegta';
@@ -149,19 +149,19 @@ $lang['Rating'] = 'Vērtējums';
 $lang['Reject All'] = 'Noraidīt Visu';
 $lang['Reject'] = 'Noraidīt';
 $lang['Representant'] = 'Pārstāvis';
-$lang['Representation of categories'] = 'Kategoriju pārstāvniecība';
+$lang['Representation of albums'] = 'Albūma attēlojums';
 $lang['Representative'] = 'Pārstāvniecisks';
 $lang['Represents'] = 'Pārstāv';
 $lang['Save order'] = 'Saglabāt kārtību';
 $lang['Save to permalink history'] = 'Saglabāt pamatsaišu vēsturē';
-$lang['Select at least one category'] = 'Izvēlēties vismaz vienu kategoriju';
+$lang['Select at least one album'] = 'Izvēlēties vismaz vienu albūmu';
 $lang['Select at least one picture'] = 'Izvēlēties vismaz vienu attēlu';
 $lang['Select at least one user'] = 'Izvēlēties vismaz vienu lietotāju';
 $lang['Show info'] = 'Rādīt informāciju';
 $lang['Site manager'] = 'Web lapu pārzinis';
 $lang['Status'] = 'Statuss';
 $lang['Statistics'] = 'Statistika';
-$lang['Storage category'] = 'Glabāšanas kategorija';
+$lang['Storage album'] = 'Albūma uzglabāšana';
 $lang['Sum of rates'] = 'Kopējais novērtējums';
 $lang['Tag "%s" already exists'] = 'Iezīme "%s" jau eksistē';
 $lang['Tag "%s" was added'] = 'Iezīme "%s" ir pievienota';
@@ -177,32 +177,32 @@ $lang['Validate All'] = 'Apstiprināt visu';
 $lang['Validate'] = 'Apstiprināt';
 $lang['Validation'] = 'Apstiprināšana';
 $lang['Version'] = 'Versija';
-$lang['Virtual categories movement'] = 'Virtuālo kategoriju pārvietošana';
-$lang['Virtual categories to move'] = 'Pārvietojamās virtuālās kategorijas';
-$lang['Virtual category name'] = 'Virtuālās kategorijas nosaukums';
+$lang['Virtual categories movement'] = 'Virtuālo albūmu kustība';
+$lang['Virtual albums to move'] = 'Virtuālie albūmi pārvietošanai';
+$lang['Virtual album name'] = 'Virtuālā albūma nosaukums';
 $lang['Webmaster cannot be deleted'] = 'Webmasteru izdzēst nevar';
 $lang['You are running on development sources, no check possible.'] = 'Jūs darbojaties izstrādes režīmā, pārbaude nav iespējama.';
 $lang['You cannot delete your account'] = 'Jūs nevarat izdzēst savu kontu';
-$lang['You cannot move a category in its own sub category'] = 'Jūs nevarat pārvietot kategoriju pašas apakškategorijā';
+$lang['You cannot move an album in its own sub album'] = 'Nevar pārvietot albūmu savā apakšalbūmā';
 $lang['You need to confirm deletion'] = 'Jums jāapstiprina izdzēšana';
 $lang['add tags'] = 'pievienot iezīmes';
 $lang['Adviser'] = 'Palīgs';
-$lang['associate to category'] = 'saistīt ar kategoriju';
+$lang['Associate to album'] = 'sasaistīt ar albūmu';
 $lang['associate to group'] = 'saistīt ar grupu';
 $lang['Authorized'] = 'Atļauts';
-$lang['Add a virtual category'] = 'Pievienot virtuālu kategoriju';
-$lang['Authorize users to add comments on selected categories'] = 'Atļaut lietotājiem pievienot komentārus izvēlētajām kategorijām';
-$lang['The name of a category should not be empty'] = 'Kategorijas nosaukums nedrīkst būt tukšs';
-$lang['Lock categories'] = 'Bloķēt kategorijas';
-$lang['Private category'] = 'Privāta kategorija';
-$lang['Public category'] = 'Publiska kategorija';
+$lang['Add a virtual album'] = 'Pievienot virtuālo albūmu';
+$lang['Authorize users to add comments on selected albums'] = 'Atļaut lietotājiem pievienot komentārus izvēlētajiem albūmiem';
+$lang['The name of an album must not be empty'] = 'Albūma nosaukums nedrīkst būt tukšs';
+$lang['Lock albums'] = 'Boķēt albūmus';
+$lang['Private'] = 'Privāts albūms';
+$lang['Public'] = 'Publiska albūms';
 $lang['Find a new representant by random'] = 'Atrast jaunu pārstāvi nejauši';
 $lang['Public / Private'] = 'Publisks / Privāts';
-$lang['Manage authorizations for selected categories'] = 'Pārvaldīt izvēlēto kategoriju autorizāciju';
-$lang['Select uploadable categories'] = 'Izvēlēties kategorijas, kurās var augšupielādēt';
-$lang['Virtual category added'] = 'Pievienota virtuāla kategorija';
-$lang['Virtual category deleted'] = 'Virtuāla kategorija izdzēsta';
-$lang['Category'] = 'Kategorija';
+$lang['Manage authorizations for selected albums'] = 'Pārvaldīt izvēlēto albūmu autorizācijas';
+$lang['Select uploadable albums'] = 'Atlasīt augšuplādējamos albūmus';
+$lang['Virtual album added'] = 'Virtuālais albūms pievienots';
+$lang['Virtual album deleted'] = 'Virtuālais albūms izdzēsts';
+$lang['Album'] = 'Albūms';
 $lang['Access type'] = 'Piekļuves tips';
 $lang['Comments'] = 'Komentāri';
 $lang['Information data registered in database'] = 'Datubāzē reģistrētā informācija';
@@ -213,11 +213,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = 'Lap
 $lang['Configuration'] = 'Konfigurācija';
 $lang['confirm'] = 'apstiprinājums';
 $lang['Date'] = 'Datums';
-$lang['delete category'] = 'izdzēst kategoriju';
-$lang['dissociate from category'] = 'atsaistīt no kategorijas';
+$lang['delete album'] = 'dzēst albūmu';
+$lang['Dissociate from album'] = 'atsaistīt no albūma';
 $lang['dissociate from group'] = 'atsaistīt no grupas';
-$lang['edit category permissions'] = 'rediģēt kategorijas atļaujas';
-$lang['Category informations updated successfully.'] = 'Informācija par kategoriju atjaunota sekmīgi.';
+$lang['edit album permissions'] = 'rediģēt piekļuves atļaujas albūmam';
+$lang['Album updated successfully'] = 'Informācija par albūmu veiksmīgi atjaunota.';
 $lang['Authorize upload'] = 'Atļaut augšupielādi';
 $lang['elements per page'] = 'elementu skaits lapā';
 $lang['elements'] = 'elementi';
@@ -234,13 +234,13 @@ $lang['group'] = 'grupa';
 $lang['The name of a group must not contain " or \' or be empty.'] = 'Grupas nosaukums nedrīkst saturēt " vai \' būt tukšs.';
 $lang['This name is already used by another group.'] = 'Šo vārdu jau lieto cita grupa.';
 $lang['High definition'] = 'Augsta izšķirtspēja';
-$lang['jump to category'] = 'pāriet uz kategoriju';
+$lang['jump to album'] = 'pāriet uz albūmu';
 $lang['jump to image'] = 'pāriet uz attēlu';
 $lang['leave'] = 'atstāt';
 $lang['Lock'] = 'Bloķēt';
 $lang['Locked'] = 'Bloķēts';
-$lang['manage category elements'] = 'Pārvaldīt kategorijas attēlus';
-$lang['manage sub-categories'] = 'Pārvaldīt apakškategorijas';
+$lang['manage album elements'] = 'Pārvaldīt albūma attēlus';
+$lang['manage sub-albums'] = 'Pārvaldīt apakšalbūmus';
 $lang['Manage'] = 'Pārvaldīt';
 $lang['maximum height'] = 'Maksimālais augstums';
 $lang['maximum width'] = 'Maksimālais platums';
@@ -350,15 +350,15 @@ $lang['synchronize'] = 'sinhronizēt';
 $lang['update the database from files'] = 'atjaunināt datu bāzi no failiem';
 $lang['status'] = 'statuss';
 $lang['Directory'] = 'Direktorija';
-$lang['sub-categories'] = 'apakškategorijas';
+$lang['sub-albums'] = 'apakšalbūmi';
 $lang['synchronize metadata'] = 'sinhronizēt metadatus';
 $lang['target'] = 'mērķis';
 $lang['Thumbnail'] = 'Piktogramma';
 $lang['title'] = 'nosaukums';
-$lang['Categories management'] = 'Pārvaldīt kategorijas';
+$lang['Album list management'] = 'Albūmu pārvaldīšana';
 $lang['Piwigo configuration'] = 'Piwigo konfigurācija';
 $lang['Piwigo administration'] = 'Piwigo administrēšana';
-$lang['Edit a category'] = 'Rediģēt kategoriju';
+$lang['Edit album'] = 'Rediģēt albūmu';
 $lang['Group management'] = 'Pārvaldīt grupas';
 $lang['User list'] = 'Lietotāju saraksts';
 $lang['Modify informations about a picture'] = 'Izmainīt informnāciju par attēlu ';
@@ -386,12 +386,12 @@ $lang['for this file format'] = 'šim faila formātam';
 $lang['unit mode'] = 'mono režīms';
 $lang['Unlocked'] = 'Atbloķēt';
 $lang['unset'] = 'notīrīt';
-$lang['Update categories informations'] = 'Atjaunināt informāciju par kategorijām';
+$lang['Update albums informations'] = 'Atjaunot albūma informāciju';
 $lang['Update images informations'] = 'Atjaunināt informāciju par attēliem';
 $lang['Synchronize'] = 'Sinhrinizēšana';
-$lang['reduce to single existing categories'] = 'pārbaudīt tikai esošo kategoriju';
+$lang['reduce to single existing albums'] = 'samazināt līdz vienam esošam albūmam';
 $lang['Choose an option'] = 'Izvēlieties iespēju';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = 'parādīt maksimāli daudz informācijas (pievienotās kategorijas un attēlus, izdēstās kategorijas un attēlus)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = 'attēlot maksimālo informāciju (pievienotie albūmi un elementi, izdzēstie albūmi un elementi)';
 $lang['Piwigo version differs on the remote site'] = 'Piwigo versija uz attālinātās web lapas atšķiras';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'Faila create_listing_file.php versijām uz attālinātās web lapas un Piwigo ir jāsakrīt';
 $lang['listing.xml file was not found'] = 'fails listing.xml nav atrasts';
@@ -401,14 +401,14 @@ $lang['Errors caption'] = 'Kļūdu apzīmējumi';
 $lang['Detailed informations'] = 'Detalizēta informācija';
 $lang['File/directory read error'] = 'Faila/mapes lasīšanas kļūda';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'Nav piekļuves failam vai mapei (vai nu neeksistē vai piekļuve liegta)';
-$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'šī attēla tipa failiem nepieciešama piktogramma. Piktogrammām jāatrodas apakšdirektorijā "thumbnail" kategorijas mapē. Piktogrammas faila nosaukuma jāsākas ar konfigurācijas failā norādīto prefiksu un paplašinājumam jābūt vienam no sarakstā esošajiem:';
+$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the album directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'šī attēla tipa failiem nepieciešama piktogramma. Piktogrammām jāatrodas apakšdirektorijā "thumbnail" kategorijas mapē. Piktogrammas faila nosaukuma jāsākas ar konfigurācijas failā norādīto prefiksu un paplašinājumam jābūt vienam no sarakstā esošajiem:';
 $lang['missing thumbnail'] = 'iztrūkst piktogramma';
-$lang['categories deleted in the database'] = 'no datu bāzes izdzēstas kategorijas';
+$lang['albums deleted in the database'] = 'no datu bāzes izdzēsti albūmi';
 $lang['elements deleted in the database'] = 'no datu bāzes izdzēsti elementi';
 $lang['images candidates for metadata synchronization'] = 'attēli, lai sinhronizētu metadatus';
 $lang['elements informations synchronized with files metadata'] = 'informācija par elementiem sinhronizēta ar metadatiem';
 $lang['errors during synchronization'] = 'kļūdas sinhronizācijas laikā';
-$lang['categories added in the database'] = 'kategoriju pievienots datu bāzei';
+$lang['albums added in the database'] = 'datu bāzei pievienoti albūmi';
 $lang['elements added in the database'] = 'elementu pievienots datu bāzei';
 $lang['elements updated in the database'] = 'elementi atjaunināti datu bāzē';
 $lang['Search for new images in the directories'] = 'Jaunus attēlu meklēšana mapēs';
@@ -432,14 +432,14 @@ $lang['user_status_generic'] = 'Vispārējais';
 $lang['user_status_guest'] = 'Viesis';
 $lang['user_status_normal'] = 'Lietotājs';
 $lang['user_status_webmaster'] = 'Webmāsters';
-$lang['Virtual category'] = 'Virtuālā kategorija';
+$lang['Virtual album'] = 'Virtuālais albūms';
 $lang['Waiting'] = 'Gaidīšana';
 $lang['default'] = 'pēc noklusējuma';
 $lang['Toggle \'default group\' property'] = 'Pretējais \'grupa pēc noklusējuma\' īpašība';
 $lang['Advanced features'] = 'Paplašinātās funkcijas';
 $lang['Not linked elements'] = 'Nesaistītie elementi';
 $lang['Specials'] = 'Īpašās funkcijas';
-$lang['Files with same name in more than one physical category'] = 'Vienāda nosaukuma faili dažādās mapēs';
+$lang['Files with same name in more than one physical album'] = 'Vienādi failu nosaukumi vairāk kā vienā eksistējošā albūmā';
 $lang['Overall'] = 'Visa';
 $lang['Year'] = 'Gads';
 $lang['Month'] = 'Mēnesis';
@@ -457,10 +457,10 @@ $lang['Save page visits by administrators'] = 'Saglabāt administratoru apmeklē
 $lang['An information email was sent to group "%s"'] = 'Informējošs e-pasts nosūtīts grupai "%s"';
 $lang['Send an information email to group members'] = 'Nosūtīt informējošu e-pastu grupas biedriem';
 $lang['Group'] = 'Grupa';
-$lang['[%s] Come to visit the category %s'] = '[%s] Apmeklējiet kategoriju %s';
+$lang['[%s] Visit album %s'] = '[%s] Apciemo albūmu %s';
 $lang['Hello,'] = 'Sveiki,';
 $lang['See you soon.'] = 'Uz redzēšanos.';
-$lang['Come to discover the category:'] = 'Apmeklējiet kategoriju:';
+$lang['Discover album:'] = 'Atklāj albūmu:';
 $lang['Mail content'] = 'Pasta saturs';
 $lang['none'] = 'neviens';
 $lang['high'] = 'liels';
@@ -584,13 +584,13 @@ $lang['Templates configuration has been recorded.'] = 'Parauga konfigurācija sa
 $lang['All optimizations have been successfully completed.'] = 'Visi uzlabojumi sekmīgi veikti	.';
 $lang['Optimizations have been completed with some errors.'] = 'Uzlabojumi veikti ar dažām kļūdām.';
 $lang['Modify information'] = 'Modificēt informāciju';
-$lang['edit category informations'] = 'rediģēt kategoriju';
+$lang['edit album'] = 'rediģēt šī albūma informāciju';
 $lang['nothing'] = 'nekas';
 $lang['overrides existing values with empty ones'] = 'pārrakstīt esošās vērtības ar tukšām';
 $lang['manage image ranks'] = 'pārvaldīt attēlu kārtību';
 $lang['Manage image ranks'] = 'Pārvaldīt attēlu kārtību';
 $lang['Edit ranks'] = 'Rediģēt kārtību';
-$lang['No element in this category'] = 'Šī kategorija ir tukša';
+$lang['No element in this album'] = 'Nav neviena elementa šinī albūmā';
 $lang['Images manual order was saved'] = 'Attēlu kārtība saglabāta';
 $lang['ranks'] = 'kārtība';
 $lang['By rank'] = 'Pēc kārtības';
@@ -632,18 +632,18 @@ $lang['Forbid this theme to users'] = 'Aizliegt lietotājiem izmantot šo tēmu'
 $lang['Set as default theme for unregistered and new users'] = 'Iestatīt tēmu pēc noklusējuma jauniem un nereģistrētiem lietotājiem';
 $lang['unknown'] = 'nezināms';
 $lang['Upload Photos'] = 'Augšupielādēt attēlus';
-$lang['Drop into category'] = 'Pārvietot kategorijā';
+$lang['Drop into album'] = 'Ievietot albūmā';
 $lang['+ Add an upload box'] = '+ Pievienot augšupielādes lauku';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Izveidot "%s" mapi jūsu instalētajā Piwigo saknes mapē';
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Piešķirt rakstīšanas tiesības (chmod 777) "%s" mapei jūsu instalētajā Piwigo saknes mapē';
-$lang['existing category'] = 'esoša kategorija';
-$lang['create a new category'] = 'izveidot jaunu kategoriju';
-$lang['Category name'] = 'Kategorijas nosaukums';
-$lang['Category "%s" has been added'] = 'Pievienota "%s" kategorija';
+$lang['existing album'] = 'esošs albūms';
+$lang['create a new album'] = 'izveidot jaunu albūmu';
+$lang['Album name'] = 'Albūma nosaukums';
+$lang['Album "%s" has been added'] = 'Pievienota "%s" kategorija';
 $lang['Uploaded Photos'] = 'Augšupielādētie attēli';
 $lang['%d photos uploaded'] = '%d ielādēti attēli';
 $lang['Privacy level set to "%s"'] = 'Iestatīt piekļuves līmeni "%s"';
-$lang['Category "%s" now contains %d photos'] = 'Kategorijā "%s" ir %d attēli';
+$lang['Album "%s" now contains %d photos'] = 'Kategorijā "%s" ir %d attēli';
 $lang['Manage this set of %d photos'] = 'Rediģēt šo %d attēlu kopumu.';
 $lang['Select files'] = 'Izvēlēties failus';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'Lūdzu JPEG failus vai ZIP arhīvus no JPEG failiem.';
@@ -670,8 +670,8 @@ $lang['Your configuration settings are saved'] = 'Jūsu konfigurācija saglabāt
 $lang['Active Themes'] = 'Aktīvās Tēmas';
 $lang['Add write access to the "%s" directory'] = 'Pievienot rakstīšanas tiesības mapei "%s"';
 $lang['Administration Home'] = 'Vadības panelis';
-$lang['Categories ordered alphanumerically'] = 'Kategorijas sakārtotas pēc alfabēta';
-$lang['Categories ordered alphanumerically reverse'] = 'Kategorijas sakārtotas pēc alfabēta';
+$lang['Categories ordered alphanumerically'] = 'Albūmi sakārtoti alfabētiskā secībā';
+$lang['Categories ordered alphanumerically reverse'] = 'Albūmi sakārtoti anti albabētiskā secībā';
 $lang['Change Admin Colors'] = 'Izmainīt vadības paneļa krāsas';
 $lang['Delete this theme'] = 'Dzēst šo tēmu';
 $lang['Directory does not exist'] = 'Nav tādas mapes';
diff --git a/language/lv_LV/common.lang.php b/language/lv_LV/common.lang.php
index e42408762..0f1fced3b 100644
--- a/language/lv_LV/common.lang.php
+++ b/language/lv_LV/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['zero_plural'] = true;
 
 $lang['%.2f (rated %d times)'] = '%.2f (nobalsots %d reizes)';
 $lang['%d Kb'] = '%d Kb';
-$lang['%d category updated'] = "%d kategorija atjaunota";
-$lang['%d categories updated'] = "%d kategorijas atjaunotas";
+$lang['%d album updated'] = '%d albūms album atjaunināts';
+$lang['%d albums updated'] = '%d albūmi atjaunināti';
 $lang['%d comment to validate'] = "%d apstiprināt komentārus";
 $lang['%d comments to validate'] = "%d apstiprināt komentarus";
 $lang['%d new comment'] = "%d jauns komentārs";
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = "Ir jaapmierina vismaz vi
 $lang['At least one tag must match'] = "Jāsakrīt vismaz vienam tagam";
 $lang['Author'] = "Autors";
 $lang['Average rate'] = "Vidējais novērtejums";
-$lang['Categories'] = "Kategorijas";
-$lang['Category'] = "Kategorija";
+$lang['Albums'] = 'Albūmi';
+$lang['Album'] = 'Albūms';
 $lang['Close this window'] = "Aizveriet šo logu";
 $lang['Complete RSS feed (images, comments)'] = "Pabeidziet RSS padevi (attēli, komentāri)";
 $lang['Confirm Password'] = "Apstiprināt paroli";
@@ -116,7 +116,7 @@ $lang['Sort by'] = "Sarindot pēc";
 $lang['Sort order'] = "Rindošanas secība";
 $lang['Tag'] = "Tags";
 $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.'] = "RSS informē par jaunumiem no šis vietnes: jauni attēli, atjauninātas kategorijas, jauni komentāri. Lietojami ar RSS piegades lasītāju.";
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'RSS nodrošina informāciju par jauniem notikumiem uz šīs web lapas: jauni attēli, atjaunināti albūmi, jauni komentāri. Lietojam ar RSS info lasītāju.';
 $lang['Unknown feed identifier'] = "Nezināms piegādes identifikators";
 $lang['User comments'] = "Lietotāja komentāri";
 $lang['Username'] = "Lietotājvārds";
@@ -132,7 +132,7 @@ $lang['Adviser mode enabled'] = "Ieslēgts padomdēvēja režīms";
 $lang['all'] = "visi";
 $lang['ascending'] = "augšupejošs";
 $lang['author(s) : %s'] = "autors(i) : %s";
-$lang['Expand all categories'] = "Izvērst visas kategorijas";
+$lang['Expand all albums'] = 'Izvērst visus albūmus';
 $lang['posted after %s (%s)'] = "ievietots pēc %s (%s)";
 $lang['posted before %s (%s)'] = "ievietots pirms %s (%s)";
 $lang['posted between %s (%s) and %s (%s)'] = "ievietots starp %s (%s) un %s (%s)";
@@ -188,15 +188,15 @@ $lang['Page generated in'] = "Uzģenerēta lappuse";
 $lang['guest'] = "viesis";
 $lang['Hello'] = "Sveiki";
 $lang['available for administrators only'] = "pieeja tikai administratoriem";
-$lang['shows images at the root of this category'] = "parādīt attēlus no pamatkataloga";
+$lang['shows images at the root of this album'] = ' parāda attēlus šī albūma pamatmapē';
 $lang['See last users comments'] = "Apskatīt pēdējos lietotāju komentārus";
 $lang['customize the appareance of the gallery'] = "pielāgot galerijas izskatu";
 $lang['search'] = "meklēt";
 $lang['Home'] = "Sākums";
 $lang['Identification'] = "Identifikācija";
-$lang['in this category'] = "šajā kategorijā";
-$lang['in %d sub-category'] = "%d apakškategorijā";
-$lang['in %d sub-categories'] = "%d apakškategorijās";
+$lang['in this album'] = 'šajā albūmā';
+$lang['in %d sub-album'] = '%d apakšalbūmā';
+$lang['in %d sub-albums'] = '%d apakšalbūmos';
 $lang['included'] = "iekļauts";
 $lang['Invalid password!'] = "Nepareiza parole!";
 $lang['Language'] = "Valoda";
@@ -210,7 +210,7 @@ $lang['Maximum height must be a number superior to 50'] = "Maksimālajam augstum
 $lang['Maximum width of the pictures'] = "Attēla maksimālais platums";
 $lang['Maximum width must be a number superior to 50'] = "Maksimālajam platumam jābūt lielākam par 50";
 $lang['display a calendar by creation date'] = "rāda kalendārā izveides datumu";
-$lang['display all elements in all sub-categories'] = "parādīt attēlus visās apakškategorijās";
+$lang['display all elements in all sub-albums'] = 'rādīt visus elementus visos albūmos un apakšalbūmos';
 $lang['return to normal view mode'] = "atgriezties normālajā apskates režīmā";
 $lang['display a calendar by posted date'] = "rāda kalendārā iesniegšanas datumu";
 $lang['month'][10] = "Oktobris";
@@ -248,8 +248,8 @@ $lang['Preferences'] = 'Izvēles';
 $lang['Previous'] = "Iepriekšējais";
 $lang['Random pictures'] = "Gadījuma attēli";
 $lang['display a set of random pictures'] = "attēlot gadījuma attēlus";
-$lang['Recent categories'] = "Jaunās kategorijas";
-$lang['display recently updated categories'] = "parādīt atjaunotās kategorijas";
+$lang['Recent albums'] = 'Jaunākie albūmi';
+$lang['display recently updated albums'] = 'parādīt jaunākos atjauninātos albūmus';
 $lang['Recent period'] = "Jauninājumu periods";
 $lang['Recent pictures'] = "Jaunie attēli";
 $lang['display most recent pictures'] = "parādīt visjaunākos attēlus";
@@ -265,7 +265,7 @@ $lang['remove this tag from the list'] = "izņemt šo tagu no saraksta";
 $lang['representative'] = "pārstāvis";
 $lang['return to homepage'] = "atgriezties mājas lapā";
 $lang['Search for Author'] = "Meklēšana pēc autora";
-$lang['Search in Categories'] = "Meklēšana pēc kategorijām";
+$lang['Search in albums'] = 'Meklēt albūmos';
 $lang['Search by Date'] = "Meklēšana pēc datuma";
 $lang['Date'] = "Datums";
 $lang['End-Date'] = "Beigu datums";
@@ -276,10 +276,10 @@ $lang['Search for any terms'] = "Meklēt pēc jebkura kritērija";
 $lang['Empty query. No criteria has been entered.'] = "Tukšs saraksts. Nav ievadīts neviens kritērijs.";
 $lang['Search Options'] = "Meklēšanas varianti";
 $lang['Search results'] = "Meklēšanas rezultāti";
-$lang['Search in subcategories'] = "Meklēt apakškategorijās";
+$lang['Search in sub-albums'] = 'Meklēt apakšalbūmos';
 $lang['searched words : %s'] = "meklējamie vārdi : %s";
 $lang['Contact'] = "Kontakts";
-$lang['set as category representative'] = "iestatīt kā kategorijas pārstāvi";
+$lang['set as album representative'] = 'iestatīt kā albūma pārstāvi';
 $lang['Show number of comments'] = "Parādīt komentāru skaitu";
 $lang['Show number of hits'] = "Parādīt apskates skaitu";
 $lang['slideshow'] = "slaidšovs";
@@ -321,7 +321,7 @@ $lang['User: %s'] = "Lietotājs: %s";
 $lang['Email: %s'] = "E-pasts: %s";
 $lang['Admin: %s'] = "Admins: %s";
 $lang['Registration of %s'] = "Reģistrācija %s";
-$lang['Category: %s'] = "Kategorija: %s";
+$lang['Album: %s'] = 'Albūms: %s';
 $lang['Picture name: %s'] = "Attēla vārds: %s";
 $lang['Creation date: %s'] = "Izveides datums: %s";
 $lang['Waiting page: %s'] = "Gaida lapu: %s";
@@ -329,7 +329,7 @@ $lang['Picture uploaded by %s'] = "Attēlu augšupielādējis %s";
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = "Lietotāja \"viesis\" nepareizs satuss, lietojiet statusu pēc noklusējuma. Lūdzu informējiet webmasteru.";
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrātors, webmāsters un īpašais lietotājs var izmantot šo metodi';
 $lang['a user use already this mail address'] = "cits lietotājs jau lieto šo pasta adresi";
-$lang['Category results for'] = "Kategoriju rezultāti priekš";
+$lang['Album results for'] = 'Albūma rezultāti priekš';
 $lang['Tag results for'] = "Tagu rezultāti priekš";
 $lang['from %s to %s'] = "no %s līdz %s";
 $lang['Play of slideshow'] = "Attēlot slaidšovu";
diff --git a/language/lv_LV/upgrade.lang.php b/language/lv_LV/upgrade.lang.php
index f6cba23b7..f7923f950 100644
--- a/language/lv_LV/upgrade.lang.php
+++ b/language/lv_LV/upgrade.lang.php
@@ -35,7 +35,7 @@ $lang['Perform a maintenance check in [Administration>Tools>Maintenance] if you
 $lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = "Piesardzības nolūkos tiek atslēgti sekojoši spraudņi. Pirms tos atkal pieslēgt, pārbaudiet vai nav pieejami to uzlabojumi:";
 $lang['Only administrator can run upgrade: please sign in below.'] = "Uzlabojumu var veikt tikai administrators: lūdzu veiciet pierakstīšanos zemāk.";
 $lang['You do not have access rights to run upgrade'] = "Jums nav pieejas tiesību, lai veiktu uzlabojumu";
-$lang['All sub-categories of private categories become private'] = "Visas privāto kategoriju apakškategorijas kļūst privātas";
+$lang['All sub-albums of private albums become private'] = 'Visi privātā albūma apakšalbūmi kļūst privāti';
 $lang['User permissions and group permissions have been erased'] = "Lietotāju un grupu piekļuves tiesības ir izdzēstas";
 $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = "No iepriekšējās konfigurācijas ir saglabāti tikai sīkbilžu prefiksi un webmāstera e-pasta adreses";
 $lang['In <i>%s</i>, before <b>?></b>, insert:'] = 'In <i>%s</i>, before <b>?></b>, insert:';
diff --git a/language/pl_PL/admin.lang.php b/language/pl_PL/admin.lang.php
index a42bc7622..91c39f178 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 album zawiera';
+$lang['%d albums including'] = '%d albumy zawierające';
 $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 album przeniesiony';
+$lang['%d albums moved'] = '%d albumów przeniesionych';
 $lang['%d group'] = '%d grupa';
 $lang['%d groups'] = '%d grup';
 $lang['%d member'] = '%d członek';
@@ -57,15 +57,15 @@ $lang['Add group'] = 'Dodaj grupę';
 $lang['Add selected elements to caddie'] = 'Dodaj wybrane elementy do koszyka';
 $lang['Add'] = 'Dodaj';
 $lang['Allow user registration'] = 'Zezwól na rejestrację użytkowników';
-$lang['Apply to subcategories'] = 'Zastosuj do podkategorii';
+$lang['Apply to sub-albums'] = 'Zastosuj do pod-albumów';
 $lang['Associated'] = 'Powiązane';
-$lang['Association to categories'] = 'Powiązania do kategorii';
+$lang['Association to categories'] = 'Powiązanie z albumami';
 $lang['Batch management'] = 'Zarządzanie batch';
 $lang['Caddie management'] = 'Zarządzanie koszykiem';
 $lang['Caddie'] = 'Koszyk';
-$lang['Categories authorized thanks to group associations'] = 'Kategorie zautoryzowane dzięki powiązaniu z grupami';
-$lang['Categories manual order was saved'] = 'Zapisano ręcznie wykonaną kolejność kategorii';
-$lang['Category elements associated to the following categories: %s'] = 'Elementy kategorii powiązane z następującymi kategoriami: %s';
+$lang['Albums authorized thanks to group associations'] = 'Albumy zautoryzowane dzięki powiązaniom z grupami';
+$lang['Album manual order was saved'] = 'Ręcznie ustawiona kolejność albumów została zapisana';
+$lang['Album elements associated to the following albums: %s'] = 'Zdjęcia albumu są powiązane z następującymi albumami: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'Sprawdzenie aktualizacji nie powiodło się z nieznanych powodów.';
 $lang['Check for upgrade'] = 'Sprawdź aktualizacje';
 $lang['Comments for all'] = 'Komentarze dla wszystkich';
@@ -103,37 +103,37 @@ $lang['Guests'] = 'Goście';
 $lang['History'] = 'Historia';
 $lang['Informations'] = 'Informacje';
 $lang['Install'] = 'Instaluj';
-$lang['Link all category elements to a new category'] = 'Podepnij wszystkie elementy kategorii do nowej kategorii';
-$lang['Link all category elements to some existing categories'] = 'Podepnij wszystkie elementy kategorii do istniejącej kategorii';
-$lang['Linked categories'] = 'Podpięte kategorie';
+$lang['Link all album elements to a new album'] = 'Podlinkuj wszystkie zdjęcia albumu do nowego albumu';
+$lang['Link all album elements to some existing albums'] = 'Podlinkuj wszystkie zdjęcia albumu do istniejących albumów';
+$lang['Linked albums'] = 'Podlinkowane albumy';
 $lang['Lock gallery'] = 'Zablokuj galerię';
 $lang['Maintenance'] = 'Przerwa techniczna';
-$lang['Manage permissions for a category'] = 'Zarządzaj uprawnieniami dla kategorii';
+$lang['Edit album permissions'] = 'Zarządzaj uprawnieniami dla albumu';
 $lang['Manage permissions for group "%s"'] = 'Zarządzaj uprawnieniami dla grupy "%s"';
 $lang['Manage permissions for user "%s"'] = 'Zarządzaj uprawnieniami dla użytkownika "%s"';
 $lang['Manage tags'] = 'Zarządzaj tagami';
 $lang['Members'] = 'Członkowie';
 $lang['Metadata synchronized from file'] = 'Metadane zsynchronizowane z pliku';
-$lang['Move categories'] = 'Przenieś kategorie';
+$lang['Move albums'] = 'Przenieś albumy';
 $lang['Move'] = 'Przenieś';
 $lang['Name'] = 'Nazwa';
 $lang['New name'] = 'Nowa nazwa';
-$lang['New parent category'] = 'Nowa nadrzędna kategoria';
+$lang['New parent album'] = 'Nowy nadrzędny album';
 $lang['New tag'] = 'Nowy tag';
 $lang['Number of comments per page'] = 'Liczba komentarzy na stronę';
 $lang['Number of rates'] = 'Liczba ocen';
 $lang['Number of thumbnails to create'] = 'Liczba miniatur do stworzenia';
-$lang['Only private categories are listed'] = 'Tylko prywatne kategorie zostały wyświetlone';
+$lang['Only private albums are listed'] = 'Lista zawiera tylko prywatne albumy';
 $lang['Operating system'] = 'System operacyjny';
 $lang['Options'] = 'Opcje';
-$lang['Other private categories'] = 'Inne kategorie prywatne';
+$lang['Other private albums'] = 'Inne prywatne albumy';
 $lang['Page banner'] = 'Banner strony';
-$lang['Parent category'] = 'Nadrzędna kategoria';
+$lang['Parent album'] = 'Nadrzędny album';
 $lang['Path'] = 'Ścieżka';
 $lang['Permalink'] = 'Link permanentny';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'Link permanentny %s został poprzednio wykorzystany przez %s. Najpierw usuń link z historii';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'Link permanentny %s był wcześniej używany przez album %s. Usuń go najpierw z historii linkó permanentnych';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'Nazwa linku permanentnego musi składać się z następujących znaków a-z, A-Z, 0-9, "-", "_" lub "/". Nie może być cyfrą lub zaczynać się od "-"';
-$lang['Permalink %s is already used by category %s'] = 'Link permanentny %s jest już używany przez kategorię %s';
+$lang['Permalink %s is already used by album %s'] = 'Link permanentny %s jest aktualnie używany przez album %s';
 $lang['Permalink history'] = 'Historia linków permanentnych';
 $lang['Permalinks'] = 'Linki permanentne';
 $lang['Permission denied'] = 'Dostęp zabroniony';
@@ -151,19 +151,19 @@ $lang['Rating'] = 'Oceny';
 $lang['Reject All'] = 'Odrzuć wszystkie';
 $lang['Reject'] = 'Odrzuć';
 $lang['Representant'] = 'Reprezentant';
-$lang['Representation of categories'] = 'Reprezentacja kategorii';
+$lang['Representation of albums'] = 'Reprezentacja albumu';
 $lang['Representative'] = 'Reprezentacyjny';
 $lang['Represents'] = 'Reprezentuje';
 $lang['Save order'] = 'Zapisz kolejność';
 $lang['Save to permalink history'] = 'Zapisz do historii linków permanentnych';
-$lang['Select at least one category'] = 'Wybierz przynajmniej jedną kategorię';
+$lang['Select at least one album'] = 'Wybierz przynajmniej jeden album';
 $lang['Select at least one picture'] = 'Wybierz przynajmniej jeden obraz';
 $lang['Select at least one user'] = 'Wybierz przynajmniej jednego użytkownika';
 $lang['Show info'] = 'Pokaż informacje';
 $lang['Site manager'] = 'Menadżer strony';
 $lang['Status'] = 'Status';
 $lang['Statistics'] = 'Statystyki';
-$lang['Storage category'] = 'Miejsce przechowywania kategorii';
+$lang['Storage album'] = 'Lokalizacja albumu';
 $lang['Sum of rates'] = 'Suma ocen';
 $lang['Tag "%s" already exists'] = 'Tag "%s" już istnieje';
 $lang['Tag "%s" was added'] = 'Tag "%s" został dodany';
@@ -178,32 +178,32 @@ $lang['Validate All'] = 'Zatwierdź wszystkie';
 $lang['Validate'] = 'Zatwierdź';
 $lang['Validation'] = 'Zatwierdzanie';
 $lang['Version'] = 'Wersja';
-$lang['Virtual categories movement'] = 'Przenoszenie kategorii wirtualnych';
-$lang['Virtual categories to move'] = 'Kategorie wirtualne do przeniesienia';
-$lang['Virtual category name'] = 'Nazwa kategorii wirtualnej';
+$lang['Virtual categories movement'] = 'Wirtualne przeniesienie albumu';
+$lang['Virtual albums to move'] = 'Wirtualne albumy do przeniesienia';
+$lang['Virtual album name'] = 'Wirtualna nazwa albumu';
 $lang['Webmaster cannot be deleted'] = 'Nie można usunąć użytkownika Webmaster';
 $lang['You are running on development sources, no check possible.'] = 'Nie można sprawdzić, ponieważ używasz źródeł developerskich.';
 $lang['You cannot delete your account'] = "Nie możesz usunąć swojego konta";
-$lang['You cannot move a category in its own sub category'] = 'Nie możesz przenieść kategorii do jej własnej podkategorii';
+$lang['You cannot move an album in its own sub album'] = 'Nie możesz przenieść albumu do jego własnego pod-albumu';
 $lang['You need to confirm deletion'] = 'Musisz potwierdzić usunięcie';
 $lang['add tags'] = 'dodaj tagi';
 $lang['Adviser'] = 'Doradca';
-$lang['associate to category'] = 'powiązane z kategorią';
+$lang['Associate to album'] = 'powiąż z albumem';
 $lang['associate to group'] = 'powiązane z grupą';
 $lang['Authorized'] = 'Zautoryzowane';
-$lang['Add a virtual category'] = 'Dodaj wirtualną kategorię';
-$lang['Authorize users to add comments on selected categories'] = 'Autoryzuj użytkowników by mogli dodawać komentarze do wybranych kategorii';
-$lang['The name of a category should not be empty'] = 'Nazwa kategorii nie może być pusta';
-$lang['Lock categories'] = 'Zablokuj kategorie';
-$lang['Private category'] = 'Kategoria prywatna';
-$lang['Public category'] = 'Kategoria publiczna';
+$lang['Add a virtual album'] = 'Dodaj wirtualny album';
+$lang['Authorize users to add comments on selected albums'] = 'Autoryzuj użytkowników do dodawania komentarzy do albumu';
+$lang['The name of an album must not be empty'] = 'Nazwa albumu nie może być pusta';
+$lang['Lock albums'] = 'Zablokuj albumy';
+$lang['Private'] = 'Album prywatny';
+$lang['Public'] = 'Album dostępny publicznie';
 $lang['Find a new representant by random'] = 'Znajdź losowo nowego reprezentanta';
 $lang['Public / Private'] = 'Publiczne / Prywatne';
-$lang['Manage authorizations for selected categories'] = 'Zarządzaj autoryzacjami dla wybranych kategorii';
-$lang['Select uploadable categories'] = 'Zaznacz kategorie, do których można wgrywać';
-$lang['Virtual category added'] = 'Dodano wirtualną kategorię';
-$lang['Virtual category deleted'] = 'Usunięto wirtualną kategorię';
-$lang['Category'] = 'kategoria';
+$lang['Manage authorizations for selected albums'] = 'Zarządzaj autoryzacjami do zaznaczonych albumów';
+$lang['Select uploadable albums'] = 'Wybierz albumy umożliwiające upload';
+$lang['Virtual album added'] = 'Album wirtualny dodany';
+$lang['Virtual album deleted'] = 'Album wirtualny usunięty';
+$lang['Album'] = 'Album';
 $lang['Access type'] = 'Typ dostępu';
 $lang['Comments'] = 'Komentarze';
 $lang['Information data registered in database'] = 'Dane zapisane w bazie danych';
@@ -214,11 +214,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = 'Lic
 $lang['Configuration'] = 'Konfiguracja';
 $lang['confirm'] = 'potwierdź';
 $lang['Date'] = 'Data';
-$lang['delete category'] = 'usuń kategorię';
-$lang['dissociate from category'] = 'usuń powiązanie od kategorii';
+$lang['delete album'] = 'usuń album';
+$lang['Dissociate from album'] = 'usuń powiązanie z albumem';
 $lang['dissociate from group'] = 'usuń powiązanie od grupy';
-$lang['edit category permissions'] = 'edytuj uprawnienia kategorii';
-$lang['Category informations updated successfully.'] = 'Informacje o kategorii zaktualizowano pomyślnie.';
+$lang['edit album permissions'] = 'edytuj uprawnienia albumu';
+$lang['Album updated successfully'] = 'Informacje o albumie zostały zaktualizowane pomyślnie.';
 $lang['Authorize upload'] = 'Zautoryzuj upload';
 $lang['elements per page'] = 'elementów na stronę';
 $lang['elements'] = 'elementy';
@@ -236,13 +236,13 @@ $lang['The name of a group must not contain " or \' or be empty.'] = 'Nazwa grup
 $lang['This name is already used by another group.'] = 'Nazwa jest już używana przez inną grupę.';
 $lang[''] = '';
 $lang['High definition'] = 'Wysoka jakość';
-$lang['jump to category'] = 'przejdź do kategorii';
+$lang['jump to album'] = 'przejdź do albumu';
 $lang['jump to image'] = 'przejdź do obrazu';
 $lang['leave'] = 'opuść';
 $lang['Lock'] = 'Zablokuj';
 $lang['Locked'] = 'Zablokowane';
-$lang['manage category elements'] = 'zarządzaj elementami kategorii';
-$lang['manage sub-categories'] = 'zarządzaj podkategoriami';
+$lang['manage album elements'] = 'Zarządzaj zdjęciami w albumie';
+$lang['manage sub-albums'] = 'Zarządzaj pod-albumami';
 $lang['Manage'] = 'Zarządzaj';
 $lang['maximum height'] = 'maksymalna wysokość';
 $lang['maximum width'] = 'maksymalna szerokość';
@@ -352,15 +352,15 @@ $lang['synchronize'] = 'synchronizuj';
 $lang['update the database from files'] = 'aktualizuj bazę danych z plików';
 $lang['status'] = 'status';
 $lang['Directory'] = 'Katalog';
-$lang['sub-categories'] = 'pod-kategorie';
+$lang['sub-albums'] = 'pod-albumy';
 $lang['synchronize metadata'] = 'synchronizuj metadane';
 $lang['target'] = 'cel';
 $lang['Thumbnail'] = 'miniatura';
 $lang['title'] = 'tytuł';
-$lang['Categories management'] = 'Zarządzanie kategoriami';
+$lang['Album list management'] = 'Zarządzanie albumami';
 $lang['Piwigo configuration'] = 'Konfiguracja Piwigo';
 $lang['Piwigo administration'] = 'Administracja Piwigo';
-$lang['Edit a category'] = 'Edytuj kategorię';
+$lang['Edit album'] = 'Edytuj album';
 $lang['Group management'] = 'Zarządzanie grupami';
 $lang['User list'] = 'Lista użytkowników';
 $lang['Modify informations about a picture'] = 'Edytuj informacje o obrazie';
@@ -388,12 +388,12 @@ $lang['for this file format'] = 'dla tego rodzaju plików';
 $lang['unit mode'] = 'tryb jednostkowy';
 $lang['Unlocked'] = 'Odblokowane';
 $lang['unset'] = 'nie ustawione';
-$lang['Update categories informations'] = 'Aktualizuj informacje o kategoriach';
+$lang['Update albums informations'] = 'Aktualizuj informacje o albumie';
 $lang['Update images informations'] = 'Aktualizuj informacje o obrazach';
 $lang['Synchronize'] = 'Synchronizuj';
-$lang['reduce to single existing categories'] = 'zredukuj do pojedynczej istniejącej kategorii';
+$lang['reduce to single existing albums'] = 'zredukuj do pojedynczego istniejącego albumu';
 $lang['Choose an option'] = 'Wybierz opcję';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = 'wyświetlaj jak dużo informacji (dodane kategorie i elementy, usunięte kategorie i elementy)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = 'pokaż maksimum informacji (dodanie albumu i elementów, usunięcie albumu i elementów)';
 $lang['Piwigo version differs on the remote site'] = 'Wersja Piwigo na zdalnej stronie jest inna';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'Wersja pliku create_listing_file.php na zdalnej stronie musi być taka sama jak w Piwigo';
 $lang['listing.xml file was not found'] = 'Nie odnaleziono pliku listing.xml';
@@ -403,14 +403,14 @@ $lang['Errors caption'] = 'Nagłówki błędów';
 $lang['Detailed informations'] = 'Informacje szczegółowe';
 $lang['File/directory read error'] = 'Błąd odczytu pliku/katalogu';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'Brak dostępu do pliku lub katalogu (nie istnieje lub brak uprawnień)';
-$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'typ pliku wymaga miniatury. Miniatura musi znajdować się w podkatalogu "thumbnail" danej kategorii. Nazwa pliku z miniaturą musi zaczynać się od skonfigurowanego prefixu, a rozszerzenie pliku musi być następujące :';
+$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the album directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'typ pliku wymaga miniatury. Miniatura musi znajdować się w podkatalogu "thumbnail" danej kategorii. Nazwa pliku z miniaturą musi zaczynać się od skonfigurowanego prefixu, a rozszerzenie pliku musi być następujące :';
 $lang['missing thumbnail'] = 'brakujące miniatury';
-$lang['categories deleted in the database'] = 'kategorii usuniętych z bazy danych';
+$lang['albums deleted in the database'] = 'albumy usunięte z bazy danych';
 $lang['elements deleted in the database'] = 'elementów usuniętych z bazy danych';
 $lang['images candidates for metadata synchronization'] = 'obrazów dla których można zsynchronizować metadane';
 $lang['elements informations synchronized with files metadata'] = 'informacji o elementach zsynchronizowanych z metadanymi plików';
 $lang['errors during synchronization'] = 'błędów podczas synchronizacji';
-$lang['categories added in the database'] = 'kategorii dodanych do bazy danych';
+$lang['albums added in the database'] = 'albumy dodane do bazy danych';
 $lang['elements added in the database'] = 'elementów dodanych do bazy danych';
 $lang['elements updated in the database'] = 'elementów zaktualizowanych w bazie danych';
 $lang['Search for new images in the directories'] = 'Szukaj nowych obrazów w katalogach';
@@ -435,14 +435,14 @@ $lang['user_status_generic'] = 'Ogólny';
 $lang['user_status_guest'] = 'Gość';
 $lang['user_status_normal'] = 'Użytkownik';
 $lang['user_status_webmaster'] = 'Webmaster';
-$lang['Virtual category'] = 'Kategoria wirtualna';
+$lang['Virtual album'] = 'Album wirtualny';
 $lang['Waiting'] = 'Oczekujące';
 $lang['default'] = 'domyślna';
 $lang['Toggle \'default group\' property'] = 'Właściwości przełączania \'grupy domyślnej\'';
 $lang['Advanced features'] = 'Zaawansowane';
 $lang['Not linked elements'] = 'Elementy nie przypisane';
 $lang['Specials'] = 'Specjalne';
-$lang['Files with same name in more than one physical category'] = 'Pliki o tych samych nazwach w jednej lub więcej kategoriach';
+$lang['Files with same name in more than one physical album'] = 'Identyczne nazwy plików w więcej niż jednym fizycznym albumie';
 
 $lang['Overall'] = 'W sumie';
 $lang['Year'] = 'Rok';
@@ -461,10 +461,10 @@ $lang['Save page visits by administrators'] = 'Zapisuj odwiedziny strony przez a
 $lang['An information email was sent to group "%s"'] = 'Powiadomienie wysłane do członków grupy "%s"';
 $lang['Send an information email to group members'] = 'Wyślij powiadomienie do członków grupy';
 $lang['Group'] = 'Grupa';
-$lang['[%s] Come to visit the category %s'] = '[%s] Wejdź aby zobaczyć kategorie %s';
+$lang['[%s] Visit album %s'] = '[%s] Odwiedź album %s';
 $lang['Hello,'] = 'Witaj,';
 $lang['See you soon.'] = 'Do zobaczenia wkrótce.';
-$lang['Come to discover the category:'] = 'Wejdź aby zobaczyć kategorie:';
+$lang['Discover album:'] = 'Odkryj album:';
 $lang['Mail content'] = 'Treść maila';
 $lang['none'] = 'brak';
 $lang['high'] = 'wysoki';
@@ -591,13 +591,13 @@ $lang['Templates configuration has been recorded.'] = 'Konfiguracja szablonów z
 $lang['All optimizations have been successfully completed.'] = 'Wszystkie optymalizacje zakończone pomyślnie.';
 $lang['Optimizations have been completed with some errors.'] = 'Optymalizacje zakończone z kilkoma błędami.';
 $lang['Modify information'] = 'Modyfikuj informacje';
-$lang['edit category informations'] = 'edytuj informacje o kategorii';
+$lang['edit album'] = 'edytuj informacje o tym albumie';
 $lang['nothing'] = 'nic';
 $lang['overrides existing values with empty ones'] = 'nadpisuje istniejące wartości pustymi';
 $lang['manage image ranks'] = 'zarządzaj rankingami obrazów';
 $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 tym albumie';
 $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ć';
@@ -642,18 +642,18 @@ $lang['Forbid this theme to users'] = 'Zabroń używania tego tematu przez użyt
 $lang['Set as default theme for unregistered and new users'] = 'Ustaw jako domyślny temat dla niezarejestrowanych użytkowników';
 $lang['unknown'] = 'nieznany';
 $lang['Upload Photos'] = 'Wgrywanie zdjęć';
-$lang['Drop into category'] = 'Wgraj do kategorii';
+$lang['Drop into album'] = 'Wrzuć do albumu';
 $lang['+ Add an upload box'] = '+ Dodaj skrzynki wgrywania';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Tworzy katalog "%s" w głównym katalogu Twojej instalacji Piwigo';
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Dodaj prawa do zapisu (chmod 777) do katalogu "%s" w głównym katalogu Twojej instalacji Piwigo';
-$lang['existing category'] = 'istniejąca kategoria';
-$lang['create a new category'] = 'stwórz nową kategorię';
-$lang['Category name'] = 'Nazwa kategorii';
-$lang['Category "%s" has been added'] = 'Kategoria "%s" została dodana';
+$lang['existing album'] = 'istniejący album';
+$lang['create a new album'] = 'stwórz nowy album';
+$lang['Album name'] = 'Nazwa albumu';
+$lang['Album "%s" has been added'] = 'Kategoria "%s" została dodana';
 $lang['Uploaded Photos'] = 'Wgrane zdjęcia';
 $lang['%d photos uploaded'] = '%d wgranych zdjęć';
 $lang['Privacy level set to "%s"'] = 'Poziom prywatności ustawiony na "%s"';
-$lang['Category "%s" now contains %d photos'] = 'Kategoria "%s" aktualnie zawiera %d zdjęć';
+$lang['Album "%s" now contains %d photos'] = 'Kategoria "%s" aktualnie zawiera %d zdjęć';
 $lang['Manage this set of %d photos'] = 'Zarządzaj tym zbiorem %d zdjęć';
 $lang['Select files'] = 'Wybierz pliki';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'Pliki JPEG lub archiwa ZIP z plikami JPEG w środku.';
@@ -679,8 +679,8 @@ $lang['Your configuration settings are saved'] = 'Twoje ustawienia konfiguracji
 $lang['Active Themes'] = 'Aktywne Tematy';
 $lang['Add write access to the "%s" directory'] = 'Dodaj ustawienia do zapisu do katalogu "%s"';
 $lang['Administration Home'] = 'Administracja';
-$lang['Categories ordered alphanumerically'] = 'Kategorie sortowane alfanumerycznie';
-$lang['Categories ordered alphanumerically reverse'] = 'Kategorie sortowane alfanumerycznie w odwrotnej kolejności';
+$lang['Categories ordered alphanumerically'] = 'Sortowanie alfanumeryczne w albunie';
+$lang['Categories ordered alphanumerically reverse'] = 'Odwrócone sortowanie alfanumeryczne w albunie';
 $lang['Change Admin Colors'] = 'Zmień kolory administracyjne';
 $lang['Delete this theme'] = 'Usuń ten temat';
 $lang['Directory does not exist'] = 'Katalog nie istnieje';
diff --git a/language/pl_PL/common.lang.php b/language/pl_PL/common.lang.php
index 06e6b4aad..79d93e85e 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 album zaktualizowany';
+$lang['%d albums updated'] = '%d albumów zaktualizowanych';
 $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';
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Przynajmniej jedna regu�
 $lang['At least one tag must match'] = 'Przynajmniej jeden tag musi pasować';
 $lang['Author'] = 'Autor';
 $lang['Average rate'] = 'Średnia ocena';
-$lang['Categories'] = 'Kategorie';
-$lang['Category'] = 'Kategoria';
+$lang['Albums'] = 'Albumy';
+$lang['Album'] = 'Album';
 $lang['Close this window'] = 'Zamknij okno';
 $lang['Complete RSS feed (images, comments)'] = 'Kompletny RSS feed (zdjęcia, komentarze)';
 $lang['Confirm Password'] = 'Potwierdź hasło';
@@ -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.'] = 'RSS dostarcza informacji o nowościach na stronie: nowe zdjęcia, zaktualizowane kategorię, nowe komentarze. Użyj czytnika 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 zapewnia powiadomienia o wydarzeniach na tej stronie: nowych zdjęciach, aktualizacjach albumów, nowych komentarzach. Do użycia z czytnikiem RSS.';
 $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 albumy';
 $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'] = 'pokazuje zdjęcia w głównym katalogu albumu';
 $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 podkategorii';
-$lang['in %d sub-categories'] = 'w %d podkategoriach';
+$lang['in this album'] = 'w tym albumie';
+$lang['in %d sub-album'] = 'w %d pod-albumie';
+$lang['in %d sub-albums'] = 'w %d pod-albumach';
 $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'] = 'Maksymalna wysokość
 $lang['Maximum width of the pictures'] = 'Maksymalna szerokość zdjęć';
 $lang['Maximum width must be a number superior to 50'] = 'Maksymalna 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'] = 'pokaż wszystkie elementy w albumach i pod-albumach';
 $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 zbiór losowych zdjęć';
-$lang['Recent categories'] = 'Aktualne kategorie';
-$lang['display recently updated categories'] = 'wyświetla ostatnio uaktualnione kategorie';
+$lang['Recent albums'] = 'Aktualne albumy';
+$lang['display recently updated albums'] = 'pokaż aktualnie zaktualizowane albumy';
 $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 albumach';
 $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 pod-albumach';
 $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 albumu';
 $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'] = 'Album: %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ą używać 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 albumu 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/pl_PL/upgrade.lang.php b/language/pl_PL/upgrade.lang.php
index 0b0919715..ac0ae01ff 100644
--- a/language/pl_PL/upgrade.lang.php
+++ b/language/pl_PL/upgrade.lang.php
@@ -33,7 +33,7 @@ $lang['Only administrator can run upgrade: please sign in below.'] = 'Tylko admi
 $lang['You do not have access rights to run upgrade'] = 'Nie masz uprawnień do wykonania aktualizacji';
 
 // Upgrade informations from upgrade_1.3.1.php
-$lang['All sub-categories of private categories become private'] = 'Wszystkie podkategorie kategorii prywatnych staną się prywatne';
+$lang['All sub-albums of private albums become private'] = 'Wszystkie pod-albumy prywatnych albumów będą prywatne';
 $lang['User permissions and group permissions have been erased'] = 'Uprawnienia użytkowników oraz grup zostały usunięte';
 $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = 'Z poprzedniej konfiguracji zostały zapisane tylko prefiksy miniatur oraz adres email administratora.';
 //For version 2.1.0
diff --git a/language/ru_RU/admin.lang.php b/language/ru_RU/admin.lang.php
index 97c58cbda..7420dfe5f 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 участник';
@@ -57,15 +57,15 @@ $lang['Add group'] = 'Добавить группу';
 $lang['Add selected elements to caddie'] = 'Добавить выбранные элементы в корзину';
 $lang['Add'] = 'Добавить';
 $lang['Allow user registration'] = 'Разрешить регистрацию пользователей';
-$lang['Apply to subcategories'] = 'Применить к подкатегориям';
+$lang['Apply to sub-albums'] = 'Применить к вложенным альбомам';
 $lang['Associated'] = 'Связаны';
-$lang['Association to categories'] = 'Связь с категориями';
+$lang['Association to categories'] = 'Ассоциация с альбомами';
 $lang['Batch management'] = 'Пакетная обработка';
 $lang['Caddie management'] = 'Управление корзиной';
 $lang['Caddie'] = 'Корзина';
-$lang['Categories authorized thanks to group associations'] = 'Категории, разрешенные благодаря связи с группой';
-$lang['Categories manual order was saved'] = 'Особый порядок категорий сохранен';
-$lang['Category elements associated to the following categories: %s'] = 'Фотографии категории, связаны со следующими категориями: %s';
+$lang['Albums authorized thanks to group associations'] = 'Альбомы разрешены благодаря  группе ассоциаций';
+$lang['Album manual order was saved'] = 'Ручной порядок альбомов был сохранен';
+$lang['Album elements associated to the following albums: %s'] = 'Альбом фотографий ассоциирован со следующими альбомами: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'Проверка обновлений не удалась по неизвестным причинам.';
 $lang['Check for upgrade'] = 'Проверить обновления';
 $lang['Comments for all'] = 'Комментарии для всех';
@@ -103,37 +103,37 @@ $lang['Guests'] = 'Гости';
 $lang['History'] = 'История';
 $lang['Informations'] = 'Информация';
 $lang['Install'] = 'Установить';
-$lang['Link all category elements to a new category'] = 'Привязать все элементы этой категории к новой';
-$lang['Link all category elements to some existing categories'] = 'Привязать все элементы этой категории к одной из существующих';
-$lang['Linked categories'] = 'Привязанные категории';
+$lang['Link all album elements to a new album'] = 'Привязать все альбомы к новому альбому';
+$lang['Link all album elements to some existing albums'] = 'Привязать фотографии всех альбомов к существующему альбому';
+$lang['Linked albums'] = 'Связать альбомы';
 $lang['Lock gallery'] = 'Заблокировать галерею';
 $lang['Maintenance'] = 'Обслуживание';
-$lang['Manage permissions for a category'] = 'Управление разрешениями для категории';
+$lang['Edit album permissions'] = 'Управлять разрешением для альбомов';
 $lang['Manage permissions for group "%s"'] = 'Управление разрешениями для группы "%s"';
 $lang['Manage permissions for user "%s"'] = 'Управление разрешениями для пользователя "%s"';
 $lang['Manage tags'] = 'Управление словами';
 $lang['Members'] = 'Участники';
 $lang['Metadata synchronized from file'] = 'Метаданные синхронизированы с файлом';
-$lang['Move categories'] = 'Перемещение категорий';
+$lang['Move albums'] = 'Переместить альбом';
 $lang['Move'] = 'Перемещение';
 $lang['Name'] = 'Название';
 $lang['New name'] = 'Новое название';
-$lang['New parent category'] = 'Новая родительская категория';
+$lang['New parent album'] = 'Новый родительский альбом';
 $lang['New tag'] = 'Новое слово';
 $lang['Number of comments per page'] = 'Количество комментариев на странице';
 $lang['Number of rates'] = 'Количество оценок';
 $lang['Number of thumbnails to create'] = 'Количество создаваемых миниатюр';
-$lang['Only private categories are listed'] = 'Показ только скрытых категорий';
+$lang['Only private albums are listed'] = 'Показаны только частные альбомы';
 $lang['Operating system'] = 'Операционная система';
 $lang['Options'] = 'Опции';
-$lang['Other private categories'] = 'Доступ к приватным категориям';
+$lang['Other private albums'] = 'Другие частные альбомы';
 $lang['Page banner'] = 'Надпись на баннере';
-$lang['Parent category'] = 'Родительская категория';
+$lang['Parent album'] = 'Родительский альбом';
 $lang['Path'] = 'Путь';
 $lang['Permalink'] = 'Постоянная ссылка';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'Постоянная ссылка %s была ранее использована для категории %s. Удалите ее сначала из истории постоянных ссылок';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'Постоянная ссылка %s была ранее использована для категории %s. Удалите ее сначала из истории постоянных ссылок';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'Имя постоянной ссылки должно состоять из a-z, A-Z, 0-9, "-" или "_". Оно не должно быть числовым или начинаться с числа с "-"';
-$lang['Permalink %s is already used by category %s'] = 'Постоянная ссылка %s уже используется для категории %s';
+$lang['Permalink %s is already used by album %s'] = 'Постоянная ссылка %s уже используется альбомом %s';
 $lang['Permalink history'] = 'История постоянных ссылок';
 $lang['Permalinks'] = 'Постоянные ссылки';
 $lang['Permission denied'] = 'Доступ запрещен';
@@ -151,19 +151,19 @@ $lang['Rating'] = 'Оценки';
 $lang['Reject All'] = 'Отклонить все';
 $lang['Reject'] = 'Отклонить';
 $lang['Representant'] = 'Представитель';
-$lang['Representation of categories'] = 'Представление категорий';
+$lang['Representation of albums'] = 'Представитель альбомов';
 $lang['Representative'] = 'Представитель';
 $lang['Represents'] = 'Представляет';
 $lang['Save order'] = 'Сохранить порядок';
 $lang['Save to permalink history'] = 'Сохранить историю постоянных ссылок';
-$lang['Select at least one category'] = 'Выберите хотя бы одну категорию';
+$lang['Select at least one album'] = 'Выберите хотя бы один альбом';
 $lang['Select at least one picture'] = 'Выберите хотя бы одно изображение';
 $lang['Select at least one user'] = 'Выберите хотя бы одного пользователя';
 $lang['Show info'] = 'Показать информацию';
 $lang['Site manager'] = 'Управление сайтами';
 $lang['Status'] = 'Статус';
 $lang['Statistics'] = 'Статистика';
-$lang['Storage category'] = 'Категория хранения';
+$lang['Storage album'] = 'Альбом для хранения';
 $lang['Sum of rates'] = 'Суммарная оценка';
 $lang['Tag "%s" already exists'] = 'Слово "%s" уже есть';
 $lang['Tag "%s" was added'] = 'Слово "%s" добавлено';
@@ -178,32 +178,32 @@ $lang['Validate All'] = 'Принять все';
 $lang['Validate'] = 'Принять';
 $lang['Validation'] = 'Проверка';
 $lang['Version'] = 'Версия';
-$lang['Virtual categories movement'] = 'Перемещение виртуальных категорий';
-$lang['Virtual categories to move'] = 'Виртуальные категории для перемещения';
-$lang['Virtual category name'] = 'Название виртуальной категории';
+$lang['Virtual categories movement'] = 'Виртуальное движение альбомов';
+$lang['Virtual albums to move'] = 'Виртуальные альбомы для перемещения';
+$lang['Virtual album name'] = 'Название виртуального альбома';
 $lang['Webmaster cannot be deleted'] = 'Нельзя удалить Вебмастера';
 $lang['You are running on development sources, no check possible.'] = 'Выполняется в режиме разработки, проверка невозможна.';
 $lang['You cannot delete your account'] = "Вы не можете удалить свой аккаунт";
-$lang['You cannot move a category in its own sub category'] = 'Вы не можете переместить категорию в ее собственную подкатегорию';
+$lang['You cannot move an album in its own sub album'] = 'Вы не можете переместить альбом в его собственный внутренний альбом';
 $lang['You need to confirm deletion'] = 'Вам нужно подтвердить удаление';
 $lang['add tags'] = 'добавить слова';
 $lang['Adviser'] = 'Помощник';
-$lang['associate to category'] = 'привязать к категории';
+$lang['Associate to album'] = 'ассоциация с альбомом';
 $lang['associate to group'] = 'привязать к группе';
 $lang['Authorized'] = 'Разрешено';
-$lang['Add a virtual category'] = 'Добавить виртуальную категорию';
-$lang['Authorize users to add comments on selected categories'] = 'Позволить пользователям добавлять комментарии к выбранным категориям';
-$lang['The name of a category should not be empty'] = 'Название категории не должно быть пустым';
-$lang['Lock categories'] = 'Заблокировать категории';
-$lang['Private category'] = 'Приватная категория';
-$lang['Public category'] = 'Общедоступная категория';
+$lang['Add a virtual album'] = 'Добавить виртуальный альбом';
+$lang['Authorize users to add comments on selected albums'] = 'Авторизованные пользователи могут добавлять комментарии к выбранным альбомам';
+$lang['The name of an album must not be empty'] = 'Название альбома не может быть пустым';
+$lang['Lock albums'] = 'Закрытые альбомы';
+$lang['Private'] = 'Частные альбомы';
+$lang['Public'] = 'Общедоступные альбомы';
 $lang['Find a new representant by random'] = 'Найти нового представителя случайным образом';
 $lang['Public / Private'] = 'Общедоступные / Приватные';
-$lang['Manage authorizations for selected categories'] = 'Управление авторизацией для выбранных категорий';
-$lang['Select uploadable categories'] = 'Выбор категорий в которые возможна загрузка';
-$lang['Virtual category added'] = 'Виртуальная категория добавлена';
-$lang['Virtual category deleted'] = 'Виртуальная категория удалена';
-$lang['Category'] = 'категория';
+$lang['Manage authorizations for selected albums'] = 'Управление авторизацией для выбранных альбомов';
+$lang['Select uploadable albums'] = 'Выбор альбомов, доступных для загрузки';
+$lang['Virtual album added'] = 'Виртуальный альбом добавлен';
+$lang['Virtual album deleted'] = 'Виртуальный альбом удален';
+$lang['Album'] = 'Альбом';
 $lang['Access type'] = 'Тип доступа';
 $lang['Comments'] = 'Комментарии';
 $lang['Information data registered in database'] = 'Информация зарегистрирована в базе данных';
@@ -213,11 +213,11 @@ $lang['Main'] = 'Главная';
 $lang['The number of comments a page must be between 5 and 50 included.'] = 'На странице может быть от 5 до 50 комментариев.';
 $lang['Configuration'] = 'Настройки';
 $lang['confirm'] = 'подтверждение';
-$lang['delete category'] = 'удалить категорию';
-$lang['dissociate from category'] = 'отвязать от категории';
+$lang['delete album'] = 'удалить альбом';
+$lang['Dissociate from album'] = 'отделить альбом';
 $lang['dissociate from group'] = 'отвязать от группы';
-$lang['edit category permissions'] = 'редактировать права для категории';
-$lang['Category informations updated successfully.'] = 'Информация о категории обновлена успешно.';
+$lang['edit album permissions'] = 'редактировать разрешения альбома';
+$lang['Album updated successfully'] = 'Информация об альбоме успешно добавлена.';
 $lang['Authorize upload'] = 'Разрешить загрузку';
 $lang['elements per page'] = 'миниатюр на странице';
 $lang['elements'] = 'элементы';
@@ -234,13 +234,13 @@ $lang['group'] = 'группа';
 $lang['The name of a group must not contain " or \' or be empty.'] = 'Название группы не должно содержать " и \' или быть пустым.';
 $lang['This name is already used by another group.'] = 'Это название уже используется для другой группы.';
 $lang['High definition'] = 'Большое разрешение';
-$lang['jump to category'] = 'перейти в категорию';
+$lang['jump to album'] = 'быстро перейти в альбом';
 $lang['jump to image'] = 'перейти к фотографии';
 $lang['leave'] = 'оставить';
 $lang['Lock'] = 'Блокировка';
 $lang['Locked'] = 'Заблокировано';
-$lang['manage category elements'] = 'управление фотографиями категории';
-$lang['manage sub-categories'] = 'управление подкатегориями';
+$lang['manage album elements'] = 'Управление фотографиями альбома';
+$lang['manage sub-albums'] = 'Управление вложенными альбомами';
 $lang['Manage'] = 'Управление';
 $lang['maximum height'] = 'максимальная высота';
 $lang['maximum width'] = 'максимальная ширина';
@@ -350,15 +350,15 @@ $lang['synchronize'] = 'синхронизировать';
 $lang['update the database from files'] = 'обновить базу данных из файлов';
 $lang['status'] = 'статус';
 $lang['Directory'] = 'Папка';
-$lang['sub-categories'] = 'подкатегории';
+$lang['sub-albums'] = 'вложенные альбомы';
 $lang['synchronize metadata'] = 'синхронизировать метаданные';
 $lang['target'] = 'изменить';
 $lang['Thumbnail'] = 'миниатюра';
 $lang['title'] = 'Название';
-$lang['Categories management'] = 'Управление категориями';
+$lang['Album list management'] = 'Управление альбомами';
 $lang['Piwigo configuration'] = 'Настройка PhpWebGallery';
 $lang['Piwigo administration'] = 'Администрирование PhpWebGallery';
-$lang['Edit a category'] = 'Редактирование категории';
+$lang['Edit album'] = 'Редактирование альбома';
 $lang['Group management'] = 'Управление группами';
 $lang['User list'] = 'Список пользователей';
 $lang['Modify informations about a picture'] = 'Изменить информацию об изображении';
@@ -386,12 +386,12 @@ $lang['for this file format'] = 'для этого формата файла';
 $lang['unit mode'] = 'одиночный режим';
 $lang['Unlocked'] = 'Разблокировать';
 $lang['unset'] = 'очистить';
-$lang['Update categories informations'] = 'обновить информацию о категориях';
+$lang['Update albums informations'] = 'Обновить информацию об альбоме';
 $lang['Update images informations'] = 'обновить информацию о фотографиях';
 $lang['Synchronize'] = 'Синхронизация';
-$lang['reduce to single existing categories'] = 'проверить только категорию';
+$lang['reduce to single existing albums'] = 'объединить в один существующий альбом';
 $lang['Choose an option'] = 'Выберите параметры';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = 'показать максимум информации (добавленные категории и фотографии, удаленные категории и элементы)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = 'показать максимум информации (добавленные и удаленные альбомы и элементы)';
 $lang['Piwigo version differs on the remote site'] = 'версия PhpWebGallery отличается на удаленном сайте';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'Версии create_listing_file.php на удаленном сайте и PhpWebGallery должны быть одинаковыми';
 $lang['listing.xml file was not found'] = 'файл listing.xml не найден';
@@ -401,14 +401,14 @@ $lang['Errors caption'] = 'Обозначение ошибки';
 $lang['Detailed informations'] = 'Детальная информация';
 $lang['File/directory read error'] = 'Ошибка чтения файла/папки';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'Нет доступа к файлу или папке (возможно они отсутствуют или доступ к ним запрещен)';
-$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'для этого типа файлов нужна миниатюра. Миниатюры должны находиться в подпапке "thumbnail" папки категории. Имя файла миниатюры должно начинаться с указанного в конфигурации префикса, расширение должно быть одним из нижеперечисленных:';
+$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the album directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'для этого типа файлов нужна миниатюра. Миниатюры должны находиться в подпапке "thumbnail" папки категории. Имя файла миниатюры должно начинаться с указанного в конфигурации префикса, расширение должно быть одним из нижеперечисленных:';
 $lang['missing thumbnail'] = 'отсутствуют миниатюры';
-$lang['categories deleted in the database'] = 'категорий удалено из базы данных';
+$lang['albums deleted in the database'] = 'альбомы удалены из базы данных';
 $lang['elements deleted in the database'] = 'элементов удалено из базы данных';
 $lang['images candidates for metadata synchronization'] = 'изображений для синхронизации метаданных';
 $lang['elements informations synchronized with files metadata'] = 'информация об элементах синхронизирована с метаданными файлов';
 $lang['errors during synchronization'] = 'ошибок синхронизации';
-$lang['categories added in the database'] = 'категорий добавлено в базу данных';
+$lang['albums added in the database'] = 'альбомы добавлены в базу данных';
 $lang['elements added in the database'] = 'элементов добавлено в базу данных';
 $lang['elements updated in the database'] = 'элементов обновлено в базе данных';
 $lang['Search for new images in the directories'] = 'Поиск новых изображений в папках';
@@ -433,14 +433,14 @@ $lang['user_status_generic'] = 'Общий';
 $lang['user_status_guest'] = 'Гость';
 $lang['user_status_normal'] = 'Пользователь';
 $lang['user_status_webmaster'] = 'Вебмастер';
-$lang['Virtual category'] = 'Виртуальная категория';
+$lang['Virtual album'] = 'Виртуальный альбом';
 $lang['Waiting'] = 'Ожидающие';
 $lang['default'] = 'по умолчанию';
 $lang['Toggle \'default group\' property'] = 'Сделать/убрать \'по умолчанию\'';
 $lang['Advanced features'] = 'Расширенные функции';
 $lang['Not linked elements'] = 'Не привязанные элементы';
 $lang['Specials'] = 'Спец функции';
-$lang['Files with same name in more than one physical category'] = 'Файлы с одинаковыми именами в разных папках';
+$lang['Files with same name in more than one physical album'] = 'Одинаковые имена файлов в более, чем одной физическом альбоме';
 
 $lang['Overall'] = 'Вся';
 $lang['Year'] = 'Год';
@@ -459,10 +459,10 @@ $lang['Save page visits by administrators'] = 'Сохранить страниц
 $lang['An information email was sent to group "%s"'] = 'Информационное письмо отправлено для группы "%s"';
 $lang['Send an information email to group members'] = 'Отправить информационное письмо для группы';
 $lang['Group'] = 'Группа';
-$lang['[%s] Come to visit the category %s'] = '[%s] Приглашаю в категорию %s';
+$lang['[%s] Visit album %s'] = '[%s] Просмотреть альбом %s';
 $lang['Hello,'] = 'Привет,';
 $lang['See you soon.'] = 'До встречи.';
-$lang['Come to discover the category:'] = 'Приходите в категорию:';
+$lang['Discover album:'] = 'Откройте для себя альбом:';
 $lang['Mail content'] = 'Содержание';
 $lang['none'] = 'нет';
 $lang['high'] = 'большой';
@@ -589,13 +589,13 @@ $lang['Templates configuration has been recorded.'] = 'Templates configuration h
 $lang['All optimizations have been successfully completed.'] = 'Все оптимизации успешно завершены.';
 $lang['Optimizations have been completed with some errors.'] = 'Оптимизации завершены с ошибками.';
 $lang['Modify information'] = 'Modify information';
-$lang['edit category informations'] = 'редактировать категорию';
+$lang['edit album'] = 'редактировать информацию об этом альбоме';
 $lang['nothing'] = 'ничего';
 $lang['overrides existing values with empty ones'] = 'замена существующих значений пустыми';
 $lang['manage image ranks'] = 'управление порядком изображений';
 $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'] = 'Перетащите чтобы изменить порядок';
@@ -638,18 +638,18 @@ $lang['Forbid this theme to users'] = 'Запретить использован
 $lang['Set as default theme for unregistered and new users'] = 'Установить тему по умолчанию для новых и незарегистрированных пользователей';
 $lang['unknown'] = 'неизвестен';
 $lang['Upload Photos'] = 'Загрузить фотографии';
-$lang['Drop into category'] = 'Перенести в категорию';
+$lang['Drop into album'] = 'Закинуть в альбом';
 $lang['+ Add an upload box'] = '+ Добавить поле для загрузки';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Создайте "%s" каталог в корне установленной Вами Piwigo';
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Дайте доступ для записи (chmod 777) к "%s" каталогу в корне установленной Вами Piwigo';
-$lang['existing category'] = 'существующая категория';
-$lang['create a new category'] = 'создать новую категория';
-$lang['Category name'] = 'Имя категории';
-$lang['Category "%s" has been added'] = 'Категория "%s" добавлена';
+$lang['existing album'] = 'существующий альбом';
+$lang['create a new album'] = 'создать новый альбом';
+$lang['Album name'] = 'Название альбома';
+$lang['Album "%s" has been added'] = 'Категория "%s" добавлена';
 $lang['Uploaded Photos'] = 'Загруженные фотографии';
 $lang['%d photos uploaded'] = '%d фотографий загружено';
 $lang['Privacy level set to "%s"'] = 'Установить уровень доступа "%s"';
-$lang['Category "%s" now contains %d photos'] = 'Категория "%s" содержит сейчас %d фотографий';
+$lang['Album "%s" now contains %d photos'] = 'Категория "%s" содержит сейчас %d фотографий';
 $lang['Manage this set of %d photos'] = 'Редактировать этот набор из %d фотографий';
 $lang['Select files'] = 'Выбрать файлы';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG файлы или ZIP архивы с JPEG файлами внутри, пожалуйста.';
@@ -675,8 +675,8 @@ $lang['Your configuration settings are saved'] = 'Ваши настройки к
 $lang['Active Themes'] = 'Активные темы';
 $lang['Add write access to the "%s" directory'] = 'Добавьте права записи для "%s" директории';
 $lang['Administration Home'] = 'Панель администрирования';
-$lang['Categories ordered alphanumerically'] = 'Категории отсортированы в алфавитном порядке';
-$lang['Categories ordered alphanumerically reverse'] = 'Категории отсортированы в обратном алфавитном порядке';
+$lang['Categories ordered alphanumerically'] = 'Альбомы отсортированы в алфавитном порядке';
+$lang['Categories ordered alphanumerically reverse'] = 'Альбомы отсортированы в обратном алфавитном порядке';
 $lang['Change Admin Colors'] = 'Изменить цвет административной панели';
 $lang['Delete this theme'] = 'Удалить эту тему';
 $lang['Directory does not exist'] = 'Директория не существует';
diff --git a/language/ru_RU/common.lang.php b/language/ru_RU/common.lang.php
index 697c3b7d3..1d330d456 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 новый комментарий';
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Хотя бы одно �
 $lang['At least one tag must match'] = 'Хотя бы одно слово должно присутствовать';
 $lang['Author'] = 'Автор';
 $lang['Average rate'] = 'Средний балл';
-$lang['Categories'] = 'Галереи';
-$lang['Category'] = 'Галерея';
+$lang['Albums'] = 'Альбомы';
+$lang['Album'] = 'Альбом';
 $lang['Close this window'] = 'Закрыть это окно';
 $lang['Complete RSS feed (images, comments)'] = 'Полная RSS лента (фотографии, комментарии)';
 $lang['Confirm Password'] = 'Повторите пароль';
@@ -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/ru_RU/upgrade.lang.php b/language/ru_RU/upgrade.lang.php
index b385b91b5..91717db9d 100644
--- a/language/ru_RU/upgrade.lang.php
+++ b/language/ru_RU/upgrade.lang.php
@@ -33,7 +33,7 @@ $lang['Only administrator can run upgrade: please sign in below.'] = 'Тольк
 $lang['You do not have access rights to run upgrade'] = 'У вас нет прав на запуск обновлений';
 
 // Upgrade informations from upgrade_1.3.1.php
-$lang['All sub-categories of private categories become private'] = 'Все подкатегории приватных категорий будут приватными';
+$lang['All sub-albums of private albums become private'] = 'Все вложенные альбомы для приватного альбома тоже становятся приватными';
 $lang['User permissions and group permissions have been erased'] = 'Разрешения пользователей и групп были стерты';
 $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = 'Только префикс эскизов и адрес почты вебмастера были сохранены от предыдущей конфигурации';
 
diff --git a/language/sk_SK/admin.lang.php b/language/sk_SK/admin.lang.php
index 661366b3f..3643c59c3 100644
--- a/language/sk_SK/admin.lang.php
+++ b/language/sk_SK/admin.lang.php
@@ -26,12 +26,12 @@
 
 $lang['%d association'] = '%d spojenie';
 $lang['%d associations'] = '%d spojení';
-$lang['%d category including'] = '%d kategória obsahujúca ';
-$lang['%d categories including'] = '%d kategórií obsahujúcich ';
+$lang['%d album including'] = '%d album obsahujúci';
+$lang['%d albums including'] = '%d albumy obsahujúce';
 $lang['%d physical'] = '%d fyzická';
 $lang[' and %d virtual'] = 'a %d virtuálna';
-$lang['%d category moved'] = '%d kategória presunutá';
-$lang['%d categories moved'] = '%d kategórií presunutých';
+$lang['%d album moved'] = '%d album presunutý';
+$lang['%d albums moved'] = '%d albumov presunutých';
 $lang['%d group'] = '%d skupina';
 $lang['%d groups'] = '%d skupín';
 $lang['%d member'] = '%d účastník';
@@ -58,15 +58,15 @@ $lang['Add group'] = 'Pridať skupinu';
 $lang['Add selected elements to caddie'] = 'Pridať vybrané položky do košíku';
 $lang['Add'] = 'Pridať';
 $lang['Allow user registration'] = 'Povoliť registráciu používateľa';
-$lang['Apply to subcategories'] = 'Použiť na podkategórie';
+$lang['Apply to sub-albums'] = 'Použiť na podalbumy';
 $lang['Associated'] = 'Priradené';
-$lang['Association to categories'] = 'Spojiť s kategóriou';
+$lang['Association to categories'] = 'Spojiť s albumom';
 $lang['Batch management'] = 'Správa dávkových úkonov';
 $lang['Caddie management'] = 'Správa košíku';
 $lang['Caddie'] = 'Košík';
-$lang['Categories authorized thanks to group associations'] = 'Kategórie schválené vďaka skupinovým spojeniam';
-$lang['Categories manual order was saved'] = 'Manuálne radenie kategórií bolo schválené';
-$lang['Category elements associated to the following categories: %s'] = 'Položky kategórií naviazané do nasledujúcich kategórií: %s';
+$lang['Albums authorized thanks to group associations'] = 'Albumy schválené vďaka skupinovým spojeniam';
+$lang['Album manual order was saved'] = 'Manuálne radenie albumov bolo schválené';
+$lang['Album elements associated to the following albums: %s'] = 'Položky albumov naviazané do nasledujúcich albumov: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'Zistenie možnosti aktualizácie sa nepodarilo';
 $lang['Check for upgrade'] = 'Zistiť možnosť aktualizácie';
 $lang['Comments for all'] = 'Komentáre pre všetkých';
@@ -104,37 +104,37 @@ $lang['Guests'] = 'Hostia';
 $lang['History'] = 'História';
 $lang['Informations'] = 'Informácie';
 $lang['Install'] = 'Inštalovať';
-$lang['Link all category elements to a new category'] = 'Napojiť všetky položky na novú kategóriu';
-$lang['Link all category elements to some existing categories'] = 'Napojiť všetky položky na niektoré existujúce kategórie';
-$lang['Linked categories'] = 'Napojené kategórie';
+$lang['Link all album elements to a new album'] = 'Napojiť všetky položky na nový album';
+$lang['Link all album elements to some existing albums'] = 'Napojiť všetky položky na niektoré existujúce albumy';
+$lang['Linked albums'] = 'Napojené albumy';
 $lang['Lock gallery'] = 'Zamknúť galériu';
 $lang['Maintenance'] = 'Údržba';
-$lang['Manage permissions for a category'] = 'Nastaviť práva pre kategóriu';
+$lang['Edit album permissions'] = 'Nastaviť práva pre album';
 $lang['Manage permissions for group "%s"'] = 'Nastaviť práva pre skupinu "%s"';
 $lang['Manage permissions for user "%s"'] = 'Nastaviť práva pre používateľa "%s"';
 $lang['Manage tags'] = 'Správa kľúčových slov';
 $lang['Members'] = 'Členovia';
 $lang['Metadata synchronized from file'] = 'Metadata synchronizované zo súboru';
-$lang['Move categories'] = 'Presunúť kategórie';
+$lang['Move albums'] = 'Presunúť albumy';
 $lang['Move'] = 'Presunúť';
 $lang['Name'] = 'Meno';
 $lang['New name'] = 'Nové meno';
-$lang['New parent category'] = 'Nová rodičovská kategória';
+$lang['New parent album'] = 'Nový rodičovský album';
 $lang['New tag'] = 'Nové kľúčové slovo';
 $lang['Number of comments per page'] = 'Počet komentárov na stránke';
 $lang['Number of rates'] = 'Počet hodnotení';
 $lang['Number of thumbnails to create'] = 'Počet náhľadov k vytvoreniu';
-$lang['Only private categories are listed'] = 'Sú zobrazené len súkromné kategórie';
+$lang['Only private albums are listed'] = 'Sú zobrazené len súkromné albumy';
 $lang['Operating system'] = 'Operačný systém';
 $lang['Options'] = 'Nastavenia';
-$lang['Other private categories'] = 'Ďalšie súkromné kategórie';
+$lang['Other private albums'] = 'Ďalšie súkromné albumy';
 $lang['Page banner'] = 'Banner stránky';
-$lang['Parent category'] = 'Rodičovská kategória';
+$lang['Parent album'] = 'Rodičovský album';
 $lang['Path'] = 'Cesta';
 $lang['Permalink'] = 'Pernamentné spojenie';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'Permanentné spojenie %s bolo predtým použité kategóriou %s. Najprv zmažte z histórie spojenia.';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'Pernamentné spojenie %s bolo predtým použité albumom %s. Najprv zmažte z histórie spojení.';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'Permanentné spojenie musí byť zložené zo znakov a-z, A-Z, 0-9, "-", "_" alebo "/". Nie je možné použiť len číslo alebo číslo nasledované "-"';
-$lang['Permalink %s is already used by category %s'] = 'Permanentné spojenie je už využívané kategóriou %s';
+$lang['Permalink %s is already used by album %s'] = 'Pernamentné spojenie je už využívané albumom %s';
 $lang['Permalink history'] = 'História permanentného spojenia';
 $lang['Permalinks'] = 'Permanentné spojenie';
 $lang['Permission denied'] = 'Prístup zamietnutý';
@@ -152,19 +152,19 @@ $lang['Rating'] = 'Hodnotenie';
 $lang['Reject All'] = 'Zamietnuť všetky';
 $lang['Reject'] = 'Zamietnuť';
 $lang['Representant'] = 'Ukážkové';
-$lang['Representation of categories'] = 'Ukážková fotografia pre kategóriu';
+$lang['Representation of albums'] = 'Reprezentatívna fotografia pre albumy';
 $lang['Representative'] = 'Ukážková fotografia';
 $lang['Represents'] = 'Ukážkové fotografie';
 $lang['Save order'] = 'Uložiť poradie';
 $lang['Save to permalink history'] = 'Uložiť do histórie permanentného spojenia';
-$lang['Select at least one category'] = 'Je nutné zvoliť aspoň jednu kategóriu';
+$lang['Select at least one album'] = 'Je nutné zvoliť aspoň jeden album';
 $lang['Select at least one picture'] = 'Je nutné zvoliť aspoň jednu fotografiu';
 $lang['Select at least one user'] = 'Je nutné zvoliť aspoň jedného používateľa';
 $lang['Show info'] = 'Zobraziť informácie';
 $lang['Site manager'] = 'Správca stránky';
 $lang['Status'] = 'Stav';
 $lang['Statistics'] = 'Štatistiky';
-$lang['Storage category'] = 'Kategória umiestnení';
+$lang['Storage album'] = 'Album umiestnení';
 $lang['Sum of rates'] = 'Sumarizácia hodnotení';
 $lang['Tag "%s" already exists'] = 'Kľúčové slovo "%" už existuje';
 $lang['Tag "%s" was added'] = '"%" kľúčové slovo bolo pridané';
@@ -180,32 +180,32 @@ $lang['Validate All'] = 'Schváliť všetky';
 $lang['Validate'] = 'Schváliť';
 $lang['Validation'] = 'Schválenie';
 $lang['Version'] = 'Verzia';
-$lang['Virtual categories movement'] = 'Presun virtuálnych kategórií';
-$lang['Virtual categories to move'] = 'Virtuálne kategórie k presunutiu';
-$lang['Virtual category name'] = 'Názov virtuálnej kategórie';
+$lang['Virtual categories movement'] = 'Presun virtuálnych albumov';
+$lang['Virtual albums to move'] = 'Virtuálne albumy k presunutiu';
+$lang['Virtual album name'] = 'Názov virtuálneho albumu';
 $lang['Webmaster cannot be deleted'] = 'Administrátor nemôže byť zmazaný';
 $lang['You are running on development sources, no check possible.'] = 'Sú používané vývojové zdrojové kódy, zistenie nie je možné.';
 $lang['You cannot delete your account'] = 'Nemôžete zmazať svoj účet';
-$lang['You cannot move a category in its own sub category'] = 'Nie je možné presunúť kategóriu do jej vlastnej podkategórie';
+$lang['You cannot move an album in its own sub album'] = 'Nie je možné presunúť album do jeho vlastného podalbumu';
 $lang['You need to confirm deletion'] = 'Je nutné potvrdiť vymazanie';
 $lang['add tags'] = 'Pridať kľúčové slová';
 $lang['Adviser'] = 'Sprievodca';
-$lang['associate to category'] = 'priradiť ku kategórii';
+$lang['Associate to album'] = 'priradiť k albumu';
 $lang['associate to group'] = 'priradiť ku skupine';
 $lang['Authorized'] = 'Autorizované';
-$lang['Add a virtual category'] = 'Pridať virtuálnu kategóriu';
-$lang['Authorize users to add comments on selected categories'] = 'Povoliť používateľom komentovať vybrané kategórie';
-$lang['The name of a category should not be empty'] = 'Meno kategórie nesmie byť prázdne';
-$lang['Lock categories'] = 'Zamknúť kategórie';
-$lang['Private category'] = 'Súkromná kategória';
-$lang['Public category'] = 'Verejná kategória';
+$lang['Add a virtual album'] = 'Pridať virtuálny album';
+$lang['Authorize users to add comments on selected albums'] = 'Povoliť používateľom komentovať vybrané albumy';
+$lang['The name of an album must not be empty'] = 'Meno albumu nesmie byť prázdne';
+$lang['Lock albums'] = 'Zamknúť albumy';
+$lang['Private'] = 'Súkromný album';
+$lang['Public'] = 'Verejný album';
 $lang['Find a new representant by random'] = 'Nájsť ukážkovú fotografiu pomocou náhodného výberu';
 $lang['Public / Private'] = 'Verejná / Súkromná';
-$lang['Manage authorizations for selected categories'] = 'Nastaviť oprávnenia pre vybrané kategórie';
-$lang['Select uploadable categories'] = 'Zvoliť kategórie s možnosťou nahrávania obsahu';
-$lang['Virtual category added'] = 'Virtuálna kategória pridaná';
-$lang['Virtual category deleted'] = 'Virtuálna kategória zmazaná';
-$lang['Category'] = 'Kategória';
+$lang['Manage authorizations for selected albums'] = 'Nastaviť oprávnenie pre vybrané albumy';
+$lang['Select uploadable albums'] = 'Zvoliť albumy s možnosťou nahrávania obsahu';
+$lang['Virtual album added'] = 'Virtuálny album pridaný';
+$lang['Virtual album deleted'] = 'Virtuálny album zmazaný';
+$lang['Album'] = 'Album';
 $lang['Access type'] = 'Druh prístupu';
 $lang['Comments'] = 'Komentáre používateľov';
 $lang['Information data registered in database'] = 'Data boli uložené do databázy';
@@ -217,11 +217,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = 'Po�
 $lang['Configuration'] = 'Konfigurácia';
 $lang['confirm'] = 'potvrdiť';
 $lang['Date'] = 'Dátum';
-$lang['delete category'] = 'vymazať kategóriu';
-$lang['dissociate from category'] = 'oddeliť od kategórie';
+$lang['delete album'] = 'vymazať album';
+$lang['Dissociate from album'] = 'oddeliť z albumu';
 $lang['dissociate from group'] = 'oddeliť od skupiny';
-$lang['edit category permissions'] = 'upraviť oprávnenia ku kategórii';
-$lang['Category informations updated successfully.'] = 'Informácie o kategórii boli úspěšne aktualizované';
+$lang['edit album permissions'] = 'upraviť oprávnenie k albumu';
+$lang['Album updated successfully'] = 'Informácie o albume boli úspěšne aktualizované.';
 $lang['Authorize upload'] = 'Povoliť nahrávanie fotografií';
 $lang['elements per page'] = 'položiek na stránke';
 $lang['elements'] = 'položky';
@@ -238,13 +238,13 @@ $lang['group'] = 'skupina';
 $lang['The name of a group must not contain " or \' or be empty.'] = 'Názov skupiny nesmie obsahovať " alebo \' alebo byť prázdny.';
 $lang['This name is already used by another group.'] = 'Toto meno je už používané pre inú skupinu.';
 $lang['High definition'] = 'Vysoké rozlíšenie';
-$lang['jump to category'] = 'prejsť do kategórie';
+$lang['jump to album'] = 'Prejsť do albumu';
 $lang['jump to image'] = 'prejsť na obrázok';
 $lang['leave'] = 'ponechať';
 $lang['Lock'] = 'Zamknúť';
 $lang['Locked'] = 'Uzamknuté';
-$lang['manage category elements'] = 'spravovať položky kategórie';
-$lang['manage sub-categories'] = 'spravovať podkategórie';
+$lang['manage album elements'] = 'Spravovať položky albumu';
+$lang['manage sub-albums'] = 'Spravovať položky podalbumov';
 $lang['Manage'] = 'Správa';
 $lang['maximum height'] = 'maximálna výška';
 $lang['maximum width'] = 'maximálna šírka';
@@ -353,15 +353,15 @@ $lang['synchronize'] = 'synchronizovať';
 $lang['update the database from files'] = 'aktualizovať databázu zo súboru';
 $lang['status'] = 'stav';
 $lang['Directory'] = 'Adresár';
-$lang['sub-categories'] = 'podkategórie';
+$lang['sub-albums'] = 'podalbumy';
 $lang['synchronize metadata'] = 'synchronizovať metadata';
 $lang['target'] = 'cieľ';
 $lang['Thumbnail'] = 'Náhľad';
 $lang['title'] = 'názov';
-$lang['Categories management'] = 'Správa kategórií';
+$lang['Album list management'] = 'Správa albumov';
 $lang['Piwigo configuration'] = 'Nastavenie aplikácie Piwigo';
 $lang['Piwigo administration'] = 'Administrácia aplikácie Piwigo';
-$lang['Edit a category'] = 'Editovať kategóriu';
+$lang['Edit album'] = 'Editovať album';
 $lang['Group management'] = 'Správa skupín';
 $lang['User list'] = 'Zoznam používateľov';
 $lang['Modify informations about a picture'] = 'Upraviť informácie o fotografii';
@@ -389,12 +389,12 @@ $lang['for this file format'] = 'pre tento formát súboru';
 $lang['unit mode'] = 'jednotlivo';
 $lang['Unlocked'] = 'Odomknuté';
 $lang['unset'] = 'nenastavovať';
-$lang['Update categories informations'] = 'Aktualizovať informácie o kategóriach';
+$lang['Update albums informations'] = 'Aktualizovať informácie o albumoch';
 $lang['Update images informations'] = 'Aktualizovať informácie o fotografiách';
 $lang['Synchronize'] = 'Synchronizácia';
-$lang['reduce to single existing categories'] = 'previesť do jedinej existujúcej kategórie';
+$lang['reduce to single existing albums'] = 'Previesť do jediného existujúceho albumu';
 $lang['Choose an option'] = 'Zvoliť nastavenie';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = 'zobraziť všetky informácie (pridané a odstránené kategórie a položky)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = 'Zobraziť všetky informácie (pridané a odstránené albumy a položky)';
 $lang['Piwigo version differs on the remote site'] = 'Verzia Piwigo na vzdialenej stránke nie je rovnaká ako miestna';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'Verzia súboru create_listing_file.php na vzdialenej stránke musí byť rovnaká ako verzia miestneho súboru';
 $lang['listing.xml file was not found'] = 'Súbor listing.xml nebol nájdený';
@@ -404,14 +404,14 @@ $lang['Errors caption'] = 'Chyby - legenda';
 $lang['Detailed informations'] = 'Detailné informácie';
 $lang['File/directory read error'] = 'Chyba pri čítaní súboru/adresára';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'Súbor alebo adresár nie je prístupný alebo neexistuje';
-$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'typ súboru vyžaduje náhľad. Náhľad musí byť umiestnený v podadresári "thumbnail" v adresári s kategóriou. Názov súboru náhľadu musí začínať nastavenou predponou a prípona musí korešpondovať s nasledujúcim zoznamom:';
+$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the album directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'typ súboru vyžaduje náhľad. Náhľad musí byť umiestnený v podadresári "thumbnail" v adresári s kategóriou. Názov súboru náhľadu musí začínať nastavenou predponou a prípona musí korešpondovať s nasledujúcim zoznamom:';
 $lang['missing thumbnail'] = 'žiadny náhľad';
-$lang['categories deleted in the database'] = 'kategórie odstránené z databázy';
+$lang['albums deleted in the database'] = 'albumy odstránené z databázy';
 $lang['elements deleted in the database'] = 'položky odstránené z databázy';
 $lang['images candidates for metadata synchronization'] = 'fotografie pre synchronizáciu metadat';
 $lang['elements informations synchronized with files metadata'] = 'informácie synchronizované z metadat súborov';
 $lang['errors during synchronization'] = 'chýb behom synchronizácie';
-$lang['categories added in the database'] = 'kategórie pridané do databázy';
+$lang['albums added in the database'] = 'albumy pridané do databázy';
 $lang['elements added in the database'] = 'položky pridané do databázy';
 $lang['elements updated in the database'] = 'položky aktualizované v databáze';
 $lang['Search for new images in the directories'] = 'Hľadať nové obrázky v kategóriách';
@@ -435,14 +435,14 @@ $lang['user_status_generic'] = 'Všeobecný';
 $lang['user_status_guest'] = 'Hosť';
 $lang['user_status_normal'] = 'Používateľ';
 $lang['user_status_webmaster'] = 'Webmaster';
-$lang['Virtual category'] = 'Virtuálna kategória';
+$lang['Virtual album'] = 'Virtuálny album';
 $lang['Waiting'] = 'Na schválenie';
 $lang['default'] = 'východzí';
 $lang['Toggle \'default group\' property'] = 'Prepnúť vlastnosť \'základná skupina\'';
 $lang['Advanced features'] = 'Rozšírené vlastnosti';
 $lang['Not linked elements'] = 'Nepripojené položky';
 $lang['Specials'] = 'Ostatné';
-$lang['Files with same name in more than one physical category'] = 'Súbory s rovnakým názvom vo viac ako jednej fyzickej kategórii';
+$lang['Files with same name in more than one physical album'] = 'Súbory s rovnakým názvom vo viac ako jednom fyzickom albume';
 $lang['Overall'] = 'Celkovo';
 $lang['Year'] = 'Rok';
 $lang['Month'] = 'Mesiac';
@@ -460,10 +460,10 @@ $lang['Save page visits by administrators'] = 'Ukladať stránky navštívené a
 $lang['An information email was sent to group "%s"'] = 'Informačný e-mail bol poslaný skupine "%s"';
 $lang['Send an information email to group members'] = 'Poslať informačný e-mail používateľom skupiny';
 $lang['Group'] = 'Skupina';
-$lang['[%s] Come to visit the category %s'] = '[%s] Navštívilo kategóriu %s';
+$lang['[%s] Visit album %s'] = '[%s] Navštívilo album %s';
 $lang['Hello,'] = 'Dobrý deň,';
 $lang['See you soon.'] = 'Dovidenia.';
-$lang['Come to discover the category:'] = 'Navštívte kategóriu:';
+$lang['Discover album:'] = 'Navštívte album:';
 $lang['Mail content'] = 'Obsah e-mailu';
 $lang['none'] = 'žiadny';
 $lang['high'] = 'vysoký';
@@ -588,13 +588,13 @@ $lang['Templates configuration has been recorded.'] = 'Nastavenie šablón bolo
 $lang['All optimizations have been successfully completed.'] = 'Všetky zmeny boli úspešne dokončené.';
 $lang['Optimizations have been completed with some errors.'] = 'Zmeny boli dokončené s niekoľkými chybami.';
 $lang['Modify information'] = 'Upraviť informácie';
-$lang['edit category informations'] = 'upraviť informácie o kategórii';
+$lang['edit album'] = 'upraviť informácie o albume';
 $lang['nothing'] = 'prázdne';
 $lang['overrides existing values with empty ones'] = 'nahradiť súčasné hodnoty prázdnymi';
 $lang['manage image ranks'] = 'spravovať hodnotenie fotografií';
 $lang['Manage image ranks'] = 'Spravovať hodnotenie fotografií';
 $lang['Edit ranks'] = 'Upraviť hodnotenie';
-$lang['No element in this category'] = 'Kategória neobsahuje žiadnu položku';
+$lang['No element in this album'] = 'Album neobsahuje žiadne položky';
 $lang['Images manual order was saved'] = 'Poradie fotografií bolo uložené';
 $lang['ranks'] = 'hodnotenie';
 $lang['Drag to re-order'] = 'Poradie zmeníte ťahaním myši';
@@ -609,18 +609,18 @@ $lang['Number of downloads'] = 'Počet stiahnutí';
 
 // --------- Starting below: New or revised $lang ---- from Colibri
 $lang['Upload Photos'] = 'Nahrať fotografie';
-$lang['Drop into category'] = 'Späť do kategórie';
+$lang['Drop into album'] = 'Späť do albumu';
 $lang['+ Add an upload box'] = '+ Pridat pole';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Vytvorte "%s" adresár v koreňovom adresári inštalácie Piwigo';
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Povoľte zápis (chmod 777,644,atď.) do "%s" adresára v koreňovom adresári inštalácie Piwigo';
-$lang['existing category'] = 'súčasná kategória';
-$lang['create a new category'] = 'vytvoriť novú kategóriu';
-$lang['Category name'] = 'Názov kategórie';
-$lang['Category "%s" has been added'] = 'Kategória "%s" pridaná';
+$lang['existing album'] = 'súčasný album';
+$lang['create a new album'] = 'Založiť nový album';
+$lang['Album name'] = 'Názov albumu';
+$lang['Album "%s" has been added'] = 'Kategória "%s" pridaná';
 $lang['Uploaded Photos'] = 'Nahrať fotografie';
 $lang['%d photos uploaded'] = '%d fotografií nahraných';
 $lang['Privacy level set to "%s"'] = 'Úroveň súkromia údajov nastavená na "%s"';
-$lang['Category "%s" now contains %d photos'] = 'Kategória "%s" teraz obsahuje %d fotografií';
+$lang['Album "%s" now contains %d photos'] = 'Kategória "%s" teraz obsahuje %d fotografií';
 $lang['Manage this set of %d photos'] = 'Spravovať tento súbor %d fotografií';
 $lang['Select files'] = 'Výber súborov';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG súbory alebo ZIP archívy s JPEG súbormi prosím.';
@@ -678,8 +678,8 @@ $lang['Your configuration settings are saved'] = 'Vaše nastavenia boli uložen�
 $lang['Active Themes'] = 'Aktívne témy';
 $lang['Add write access to the "%s" directory'] = 'Nastavte prístup pre zápis do adresára "%s"';
 $lang['Administration Home'] = 'Úvodná stránka administrácie';
-$lang['Categories ordered alphanumerically'] = 'Kategórie zoradené podľa abecedy';
-$lang['Categories ordered alphanumerically reverse'] = 'Kategórie zoradené zostupne podľa abecedy';
+$lang['Categories ordered alphanumerically'] = 'Albumy zoradené podľa abecedy';
+$lang['Categories ordered alphanumerically reverse'] = 'Albumy zoradené zostupne podľa abecedy';
 $lang['Change Admin Colors'] = 'Zmeňte farvy administrácie';
 $lang['Delete this theme'] = 'Zrušte túto tému';
 $lang['Directory does not exist'] = 'Adresár neexistuje';
diff --git a/language/sk_SK/common.lang.php b/language/sk_SK/common.lang.php
index 47d53948b..d7da2aa94 100644
--- a/language/sk_SK/common.lang.php
+++ b/language/sk_SK/common.lang.php
@@ -34,8 +34,8 @@ $lang_info['zero_plural'] = true;
 
 $lang['%.2f (rated %d times)'] = '%.2f (hodnotené %d krát)';
 $lang['%d Kb'] = '%d Kb';
-$lang['%d category updated'] = '%d kategória aktualizovaná';
-$lang['%d categories updated'] = '%d kategórie aktualizované';
+$lang['%d album updated'] = '%d album aktualizovaný';
+$lang['%d albums updated'] = '%d albumov aktualizovaných';
 $lang['%d comment to validate'] = '%d komentár na schválenie';
 $lang['%d comments to validate'] = '%d komentárov na schválenie';
 $lang['%d new image'] = '%d nová fotka';
@@ -57,8 +57,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Aspoň jedno pravidlo zo
 $lang['At least one tag must match'] = 'Aspoň jedno kľúčové slovo musí zodpovedať';
 $lang['Author'] = 'Autor';
 $lang['Average rate'] = 'Priemerné hodnotenie';
-$lang['Categories'] = 'Kategórie';
-$lang['Category'] = 'Kategória';
+$lang['Albums'] = 'Albumy';
+$lang['Album'] = 'Album';
 $lang['Close this window'] = 'Zatvoriť okno';
 $lang['Complete RSS feed (images, comments)'] = 'Kompletné RSS vlákno (fotografie, komentáre)';
 $lang['Confirm Password'] = 'Potvrdiť heslo';
@@ -121,7 +121,7 @@ $lang['Sort by'] = 'Zoradiť podľa';
 $lang['Sort order'] = 'Smer zoradenia';
 $lang['Tag'] = 'Kľúčové slovo';
 $lang['Tags'] = 'Kľúčové slová';
-$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ánkach: nové fotografie, aktualizované kategórie, komentáre. Použite RSS čítač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ánkach: nové fotografie, aktualizované albumy, komentáre. Použite RSS čítačku.';
 $lang['Unknown feed identifier'] = 'Neznámý identifikátor vlákna';
 $lang['User comments'] = 'Komentáre používateľov';
 $lang['Username'] = 'Používateľské meno';
@@ -137,7 +137,7 @@ $lang['Adviser mode enabled'] = 'Aktivovaný mód sprievodcu';
 $lang['all'] = 'všetko';
 $lang['ascending'] = 'vzostupne';
 $lang['author(s) : %s'] = 'autor : %s';
-$lang['Expand all categories'] = 'Rozbaliť všetky kategórie';
+$lang['Expand all albums'] = 'Rozbaliť všetky albumy';
 $lang['posted after %s (%s)'] = 'vložené po %s (%s)';
 $lang['posted before %s (%s)'] = 'vložené pred %s (%s)';
 $lang['posted between %s (%s) and %s (%s)'] = 'vložené medzi %s (%s) a %s (%s)';
@@ -193,15 +193,15 @@ $lang['Page generated in'] = 'Stránka vytvorená ';
 $lang['guest'] = 'hosť';
 $lang['Hello'] = 'Prihlásený ako';
 $lang['available for administrators only'] = 'prístupné len adminitrátorom';
-$lang['shows images at the root of this category'] = 'zobraziť fotografie v tejto kategórii';
+$lang['shows images at the root of this album'] = 'shows images at the root of this album';
 $lang['See last users comments'] = 'Zobraziť najnovšie komentáre používateľov';
 $lang['customize the appareance of the gallery'] = 'prispôsobiť vzhľad galérie';
 $lang['search'] = 'hľadať';
 $lang['Home'] = 'Úvodná stránka';
 $lang['Identification'] = 'Identifikácia';
-$lang['in this category'] = 'v tejto kategórii';
-$lang['in %d sub-category'] = 'v %d podkategórii';
-$lang['in %d sub-categories'] = 'v %d podkategóriach';
+$lang['in this album'] = 'v tomto albume';
+$lang['in %d sub-album'] = 'v %d podalbume';
+$lang['in %d sub-albums'] = 'v %d podalbumoch';
 $lang['included'] = 'vrátane';
 $lang['Invalid password!'] = 'Neplatné heslo!';
 $lang['Language'] = 'Jazyk';
@@ -215,7 +215,7 @@ $lang['Maximum height must be a number superior to 50'] = 'Maximálna výška mu
 $lang['Maximum width of the pictures'] = 'Maximálna šírka fotografií';
 $lang['Maximum width must be a number superior to 50'] = 'Maximálna šírka musí byť číslo väčšie ako 50';
 $lang['display a calendar by creation date'] = 'zobraziť v kalendári podľa dátumu vytvorenia';
-$lang['display all elements in all sub-categories'] = 'Zobraziť všetky objekty v podkategóriach';
+$lang['display all elements in all sub-albums'] = 'zobraziť všetky objekty v podalbumoch';
 $lang['return to normal view mode'] = 'návrat do normálneho zobrazenia';
 $lang['display a calendar by posted date'] = 'zobraziť v kalendári podľa dátumu vloženia';
 $lang['month'][10] = 'Október';
@@ -253,8 +253,8 @@ $lang['Preferences'] = 'Nastavenia';
 $lang['Previous'] = 'Predchádzajúca';
 $lang['Random pictures'] = 'Náhodný výber';
 $lang['display a set of random pictures'] = 'Zobraziť sadu fotografií podľa náhodného výberu';
-$lang['Recent categories'] = 'Nové kategórie';
-$lang['display recently updated categories'] = 'zobraziť novo pridané kategórie';
+$lang['Recent albums'] = 'Nové albumy';
+$lang['display recently updated albums'] = 'zobraziť novo pridané albumy';
 $lang['Recent period'] = 'Doba, počas ktorej sú fotografie zobrazované ako novo pridané';
 $lang['Recent pictures'] = 'Nové fotografie';
 $lang['display most recent pictures'] = 'zobraziť novo pridané fotografie';
@@ -270,7 +270,7 @@ $lang['remove this tag from the list'] = 'odstrániť toto kľúčové slovo zo
 $lang['representative'] = 'vzorový';
 $lang['return to homepage'] = 'späť na úvodnú stránku';
 $lang['Search for Author'] = 'Hľadať autora';
-$lang['Search in Categories'] = 'Hľadanie v kategóriach';
+$lang['Search in albums'] = 'Hľadanie v albumoch';
 $lang['Search by Date'] = 'Hľadať podľa dátumu pridania';
 $lang['Date'] = 'Od';
 $lang['End-Date'] = 'Do';
@@ -281,10 +281,10 @@ $lang['Search for any terms'] = 'Hľadať všetky výrazy';
 $lang['Empty query. No criteria has been entered.'] = 'Neúplný dotaz. Neboli zadané žiadne podmienky pre vyhľadávanie.';
 $lang['Search Options'] = 'Kritéria vyhľadávania';
 $lang['Search results'] = 'Výsledky vyhľadávania';
-$lang['Search in subcategories'] = 'Hľadať v podkategóriach';
+$lang['Search in sub-albums'] = 'Hľadanie v subalbumoch';
 $lang['searched words : %s'] = 'hľadať slová: %s';
 $lang['Contact'] = 'Kontakt';
-$lang['set as category representative'] = 'Nastaviť kategóriu ako vzorovú';
+$lang['set as album representative'] = 'nastaviť album ako reprezentatívny';
 $lang['Show number of comments'] = 'Ukázať počet komentárov';
 $lang['Show number of hits'] = 'Ukázať počet zobrazení';
 $lang['slideshow'] = 'automatické prehrávanie';
@@ -326,7 +326,7 @@ $lang['User: %s'] = 'Používateľ: %s';
 $lang['Email: %s'] = 'E-mail: %s';
 $lang['Admin: %s'] = 'Administrátor: %s';
 $lang['Registration of %s'] = 'Registrácia %s';
-$lang['Category: %s'] = 'Kategória: %s';
+$lang['Album: %s'] = 'Album: %s';
 $lang['Picture name: %s'] = '*Názov fotografie: %s';
 $lang['Creation date: %s'] = 'Dátum vytvorenia: %s';
 $lang['Waiting page: %s'] = 'Čakanie 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, webmaster a špeciálny používateľ nemôžu použiť túto metódu.';
 $lang['a user use already this mail address'] = 'táto e-mailová adresa je už používaná';
-$lang['Category results for'] = 'Výsledky pre kategórie';
+$lang['Album results for'] = 'Výsledky pre album';
 $lang['Tag results for'] = 'Výsledky pre kľúčové slová';
 $lang['from %s to %s'] = 'od %s do %s';
 $lang['Play of slideshow'] = 'Spustiť prezentáciu';
diff --git a/language/sk_SK/upgrade.lang.php b/language/sk_SK/upgrade.lang.php
index 7a3ea5f2e..2f9eb9556 100644
--- a/language/sk_SK/upgrade.lang.php
+++ b/language/sk_SK/upgrade.lang.php
@@ -37,7 +37,7 @@ $lang['You do not have access rights to run upgrade'] = 'Nemáte prístupové pr
 
 
 // Upgrade informations from upgrade_1.3.1.php
-$lang['All sub-categories of private categories become private'] = 'Všetky podkategórie súkromných kategórií sa stanú súkromnými';
+$lang['All sub-albums of private albums become private'] = 'Všetky subalbumy súkromných albumov budú súkromné';
 $lang['User permissions and group permissions have been erased'] = 'Používateľské oprávnenia a oprávnenia skupín boli vymazané';
 $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = 'Z predchádzajúcej konfigurárie boli zachované len predpony náhľadov a mailová adresa webmastra.';
 
diff --git a/language/tr_TR/admin.lang.php b/language/tr_TR/admin.lang.php
index 56a178b22..7b18f0e35 100644
--- a/language/tr_TR/admin.lang.php
+++ b/language/tr_TR/admin.lang.php
@@ -23,12 +23,12 @@
 
 $lang['%d association'] = '%d baglanti';
 $lang['%d associations'] = '%d baglantilar';
-$lang['%d category including'] = '%d kategori ekleniyor';
-$lang['%d categories including'] = '%d kategoriler ekleniyor';
+$lang['%d album including'] = '%d albüm dahil';
+$lang['%d albums including'] = '%d albümler dahil';
 $lang['%d physical'] = ' %d fiziksel';
 $lang[' and %d virtual'] = ' and %d sanal';
-$lang['%d category moved'] = '%d kategori tasindi';
-$lang['%d categories moved'] = '%d kategoriler tasindi';
+$lang['%d album moved'] = '%d albüm taşındı';
+$lang['%d albums moved'] = '%d albümler taşındı';
 $lang['%d group'] = '%d grup';
 $lang['%d groups'] = '%d gruplar';
 $lang['%d member'] = '%d üye';
@@ -55,15 +55,15 @@ $lang['Add group'] = 'grup ekle';
 $lang['Add selected elements to caddie'] = 'seçilen elemanlari yardimciya ekle';
 $lang['Add'] = 'Ekle';
 $lang['Allow user registration'] = 'kullanici kaydina izin ver';
-$lang['Apply to subcategories'] = 'alt kategorileri uygula';
+$lang['Apply to sub-albums'] = 'bu altalbümlere uygula';
 $lang['Associated'] = 'baglantili';
-$lang['Association to categories'] = 'kategorileri baglantila';
+$lang['Association to categories'] = ' bu albümlere ilişkilendir';
 $lang['Batch management'] = 'toplu komut yönetimi';
 $lang['Caddie management'] = 'yardimci yönetimi';
 $lang['Caddie'] = 'yardimci';
-$lang['Categories authorized thanks to group associations'] = 'Kategori onaylandi, Grup yöneticisine tesekkür ederiz.';
-$lang['Categories manual order was saved'] = 'Kategorileriler el ile düzenlendi. Degisiklikler kaydedildi.';
-$lang['Category elements associated to the following categories: %s'] = 'Kategori ve içerigi ilgili kategorilerle baglantilandirildi.: %s';
+$lang['Albums authorized thanks to group associations'] = 'Albümler grup sayesinde yetkili';
+$lang['Album manual order was saved'] = 'Albümlerin sıralaması kayıt edildi';
+$lang['Album elements associated to the following albums: %s'] = 'Albüm fotoğrafları aşağıdaki albümlere ilişkili: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'Güncelleme denetimi sonuçlanamiyor, Yaptiginiz islem basarisiz oldu..';
 $lang['Check for upgrade'] = 'Güncellemelere bak';
 $lang['Comments for all'] = 'Hepsine yorum yap';
@@ -101,37 +101,37 @@ $lang['Guests'] = 'Ziyaretçiler';
 $lang['History'] = 'Geçmis';
 $lang['Informations'] = 'Bilgiler';
 $lang['Install'] = 'Kur';
-$lang['Link all category elements to a new category'] = 'Tüm kategori içeriklerini yeni kategoriyle bagla';
-$lang['Link all category elements to some existing categories'] = 'Tüm kategori içeriklerini varolan kategorilerle bagla';
-$lang['Linked categories'] = 'bagli kategoriler';
+$lang['Link all album elements to a new album'] = 'Bütün albüm resimlerini yeni albümü bağla';
+$lang['Link all album elements to some existing albums'] = 'Bütün albüm resimlerini olan albümlere bağla';
+$lang['Linked albums'] = 'bağlanan albümler';
 $lang['Lock gallery'] = 'galeriyi kilitle';
 $lang['Maintenance'] = 'Bakim';
-$lang['Manage permissions for a category'] = 'Kategori izinlerini düzenle';
+$lang['Edit album permissions'] = 'albüm yetkilerini düzenle';
 $lang['Manage permissions for group "%s"'] = 'Grup izinlerini düzenle"%s"';
 $lang['Manage permissions for user "%s"'] = 'Kullanici izinlerini düzenle "%s"';
 $lang['Manage tags'] = 'Etiketleri düzenle';
 $lang['Members'] = 'Üyeler';
 $lang['Metadata synchronized from file'] = 'Metadata dosyadan senkronize edildi';
-$lang['Move categories'] = 'Kategorileri Tasi';
+$lang['Move albums'] = 'albümleri taşı';
 $lang['Move'] = 'Tasi';
 $lang['Name'] = 'Isim';
 $lang['New name'] = 'Yeni isim';
-$lang['New parent category'] = 'Yeni ana kategori';
+$lang['New parent album'] = 'yeni ana albüm';
 $lang['New tag'] = 'Yeni etiket';
 $lang['Number of comments per page'] = 'Her sayfadaki yorum sayisi';
 $lang['Number of rates'] = 'Reyting sayisi';
 $lang['Number of thumbnails to create'] = 'Yaratilacak thumbnail sayisi';
-$lang['Only private categories are listed'] = 'Sadece özel kategoriler listendi';
+$lang['Only private albums are listed'] = 'sadecee özel albümler listelendi';
 $lang['Operating system'] = 'Isletim sistemi';
 $lang['Options'] = 'Seçenekler';
-$lang['Other private categories'] = 'Diger özel kategoriler';
+$lang['Other private albums'] = 'diğer özel albümler';
 $lang['Page banner'] = 'Sayfa banneri';
-$lang['Parent category'] = 'Ana kategori';
+$lang['Parent album'] = 'Ana albüm';
 $lang['Path'] = 'Yol';
 $lang['Permalink'] = 'Permalink';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = 'Permalink %s zateb %s kategorisi tarafindan kullanildi. Önce permalink geçmisten siliniz.';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'Permalink %s albüm tarafından kullanıldı %s. Önce onu permalik geçmişinden siliniz';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'Permalik ismi a-z, A-Z, 0-9, "-", "_" yada "/" karekterlerinden olusmalidir. Sayisal olmamali veya sayi ile baslamamalidir';
-$lang['Permalink %s is already used by category %s'] = 'Permalink %s zaten %s kategorisi tarafindan kullanildi';
+$lang['Permalink %s is already used by album %s'] = 'Permalink %s albüm tarafından kullanıldı%s';
 $lang['Permalink history'] = 'Permalinler geçmisi';
 $lang['Permalinks'] = 'Permalinkler';
 $lang['Permission denied'] = 'Izin verilmedi';
@@ -149,19 +149,19 @@ $lang['Rating'] = 'Puan';
 $lang['Reject All'] = 'Hepsini reddet';
 $lang['Reject'] = 'Reddet';
 $lang['Representant'] = 'Temsilen';
-$lang['Representation of categories'] = 'Kategoriler temsilcisi';
+$lang['Representation of albums'] = 'Albüm gösterimi';
 $lang['Representative'] = 'Temsilci';
 $lang['Represents'] = 'Temsilciler';
 $lang['Save order'] = 'Düzeni kaydet';
 $lang['Save to permalink history'] = 'Permalinkler geçmisini kaydet';
-$lang['Select at least one category'] = 'En az bir kategori seçiniz';
+$lang['Select at least one album'] = 'en az bir albüm seçiniz';
 $lang['Select at least one picture'] = 'En az bir resim seçiniz';
 $lang['Select at least one user'] = 'En az bir kullanici seçiniz';
 $lang['Show info'] = 'Bilgi Göster';
 $lang['Site manager'] = 'Site yöneticisi';
 $lang['Status'] = 'Durum';
 $lang['Statistics'] = 'Istatistikler';
-$lang['Storage category'] = 'Depolama kategori';
+$lang['Storage album'] = 'Depola albümü';
 $lang['Sum of rates'] = 'Toplam reytingler';
 $lang['Tag "%s" already exists'] = 'Etiket "%s" zaten var';
 $lang['Tag "%s" was added'] = 'Etiket "%s" eklendi';
@@ -177,32 +177,32 @@ $lang['Validate All'] = 'Hepsini dogrula';
 $lang['Validate'] = 'Dogrula';
 $lang['Validation'] = 'Dogrula';
 $lang['Version'] = 'Versiyon';
-$lang['Virtual categories movement'] = 'Sanal kategoriler hareketi';
-$lang['Virtual categories to move'] = 'Tasinacak sanal kategoriler';
-$lang['Virtual category name'] = 'Sanal kategori ismi';
+$lang['Virtual categories movement'] = 'Sanal albümler hareket';
+$lang['Virtual albums to move'] = 'Taşınacak sanal albümler';
+$lang['Virtual album name'] = 'Sanal albüm ismi';
 $lang['Webmaster cannot be deleted'] = 'Site yöneticisi silinemez';
 $lang['You are running on development sources, no check possible.'] = 'Gelistirme kaynaklarini kullaniyorsunuz incelemek mümkün degil';
 $lang['You cannot delete your account'] = 'Kendi hesabinizi silemezsiniz';
-$lang['You cannot move a category in its own sub category'] = 'Bir kategoriyi onun alt kategorisi içine tasiyamazsiniz';
+$lang['You cannot move an album in its own sub album'] = 'Bir albümü kendi alt bölümü içindeki albüme taşıyamazsınız';
 $lang['You need to confirm deletion'] = 'Silme islemini onaylayiniz';
 $lang['add tags'] = 'Etiketler ekle';
 $lang['Adviser'] = 'Danisman';
-$lang['associate to category'] = 'Kategoriye iliskilendirmek';
+$lang['Associate to album'] = 'bağla albüme';
 $lang['associate to group'] = 'Gruba iliskilendirmek';
 $lang['Authorized'] = 'Yetkili';
-$lang['Add a virtual category'] = 'Sanal bir kategori ekle';
-$lang['Authorize users to add comments on selected categories'] = 'Seçili kategorilere yorum eklemek için kullanicilara yetkilendirin';
-$lang['The name of a category should not be empty'] = 'Kategori ismi bos olamaz';
-$lang['Lock categories'] = 'Kategorileri kilitle';
-$lang['Private category'] = 'Özel kategori';
-$lang['Public category'] = 'Genel kategori';
+$lang['Add a virtual album'] = 'sanal albüm ekle';
+$lang['Authorize users to add comments on selected albums'] = 'Kullanıcıları seçilen albümler için yorum yapmaya yetkilendir';
+$lang['The name of an album must not be empty'] = 'Albüm ismi boş olamaz';
+$lang['Lock albums'] = 'albümlerikilitle';
+$lang['Private'] = 'Özel albüm';
+$lang['Public'] = 'Genel albüm';
 $lang['Find a new representant by random'] = 'Rasgele yeni bir temsilci bul';
 $lang['Public / Private'] = 'Genel / Özel';
-$lang['Manage authorizations for selected categories'] = 'Seçilen kategoriler için yetkileri ayarla';
-$lang['Select uploadable categories'] = 'Yüklenebilir kategorileri seçiniz';
-$lang['Virtual category added'] = 'Sanal kategori eklendi';
-$lang['Virtual category deleted'] = 'Sanal kategori silindi';
-$lang['Category'] = 'Kategori';
+$lang['Manage authorizations for selected albums'] = 'Seçilen albümler için yetkileri yönetimi';
+$lang['Select uploadable albums'] = 'yüklenebilir albümleri seç';
+$lang['Virtual album added'] = 'sanal albüm eklendi';
+$lang['Virtual album deleted'] = 'sanal albüm silindi';
+$lang['Album'] = 'Albüm';
 $lang['Access type'] = 'Erisim türü';
 $lang['Comments'] = 'Yorumlar';
 $lang['Information data registered in database'] = 'Bilgilerin veritabaninda kayitli';
@@ -213,11 +213,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = 'Bir
 $lang['Configuration'] = 'Konfigürasyon';
 $lang['confirm'] = 'Onayla';
 $lang['Date'] = 'Tarih';
-$lang['delete category'] = 'Kategoriyi sil';
-$lang['dissociate from category'] = 'Kategoriden ayirmak';
+$lang['delete album'] = 'albümüsil';
+$lang['Dissociate from album'] = 'albümden ayır';
 $lang['dissociate from group'] = 'Gruptan ayirmak';
-$lang['edit category permissions'] = 'Kategorideki izinleri degistir';
-$lang['Category informations updated successfully.'] = 'Kategori bilgiler basariyla güncellendi.';
+$lang['edit album permissions'] = 'albüm yetkilerini düzenle';
+$lang['Album updated successfully'] = 'Albüm bilgileri güncellendi.';
 $lang['Authorize upload'] = 'Yükleme izni';
 $lang['elements per page'] = 'Safya basina içerikler';
 $lang['elements'] = 'içerikler';
@@ -234,13 +234,13 @@ $lang['group'] = 'Grup';
 $lang['The name of a group must not contain " or \' or be empty.'] = 'Bir grubun ismi " veya \ içermemelidir yada bos olmamalidir.';
 $lang['This name is already used by another group.'] = 'Bu isim baska bir grup tarafindan kullanilmaktadir';
 $lang['High definition'] = 'Yüksek çözünürlüklü';
-$lang['jump to category'] = 'Kategoriye geç';
+$lang['jump to album'] = 'albüme geç';
 $lang['jump to image'] = 'Resime geç';
 $lang['leave'] = 'Ayril';
 $lang['Lock'] = 'Kilit';
 $lang['Locked'] = 'Kilitlendi';
-$lang['manage category elements'] = 'Kategori içerigini yönet';
-$lang['manage sub-categories'] = 'Alt kategorileri yönet';
+$lang['manage album elements'] = 'albüm resimlerini yönet';
+$lang['manage sub-albums'] = 'yönet alt-albümler';
 $lang['Manage'] = 'Yönet';
 $lang['maximum height'] = 'Maksimum yükseklik';
 $lang['maximum width'] = 'Maksimum genislik';
@@ -350,15 +350,15 @@ $lang['synchronize'] = 'Senkronize etmek';
 $lang['update the database from files'] = 'Dosyalar ile veritabani güncelleme';
 $lang['status'] = 'Durum';
 $lang['Directory'] = 'Dizin';
-$lang['sub-categories'] = 'Alt Kategori';
+$lang['sub-albums'] = 'alt-albümler';
 $lang['synchronize metadata'] = 'Senkronize metadata';
 $lang['target'] = 'Hedef';
 $lang['Thumbnail'] = 'Küçük resim';
 $lang['title'] = 'Baslik';
-$lang['Categories management'] = 'Kategoriler yönetimi';
+$lang['Album list management'] = 'Albümler yönetimi';
 $lang['Piwigo configuration'] = 'Piwigo yapilandirma';
 $lang['Piwigo administration'] = 'Piwigo yönetim';
-$lang['Edit a category'] = 'Kategori düzenle';
+$lang['Edit album'] = 'albüm düzenle';
 $lang['Group management'] = 'Grup yönetimi';
 $lang['User list'] = 'Kullanicilar listesi';
 $lang['Modify informations about a picture'] = 'Resim bilgilerini düzenle';
@@ -387,12 +387,12 @@ $lang['unit mode'] = 'tek modlu';
 $lang['Unlocked'] = 'Kilitsiz';
 $lang['unset'] = 'Kaldirmak';
 $lang['Month'] = 'Sıra';
-$lang['Update categories informations'] = 'Kategorilerin bilgilerini güncelle';
+$lang['Update albums informations'] = 'albümlerin bilgilerini güncelle';
 $lang['Update images informations'] = 'Resimlerin bilgilerini güncelle';
 $lang['Synchronize'] = 'Senkronize';
-$lang['reduce to single existing categories'] = 'Tek mevcut kategorilere azaltmak';
+$lang['reduce to single existing albums'] = 'mevcut albümleri küçült';
 $lang['Choose an option'] = 'Bir seçenek seç';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = 'en fazla bilgi göster(eklenen kategorileri ve elemanları,silinenkategoriler ve elemanları)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = 'Ekran en fazla bilgisi (eklenen albümler resimler, silinen albümler resimler)';
 $lang['Piwigo version differs on the remote site'] = 'Piwigo sürümü uzak sitede farklı';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = 'Uzak site ve Piwigo üzerinde create_listing_file.php sürümleri aynı olmalıdır';
 $lang['listing.xml file was not found'] = 'listing.xml dosyası bulunamadı';
@@ -402,14 +402,14 @@ $lang['Errors caption'] = 'Hatalar başlıkları';
 $lang['Detailed informations'] = 'Detaylı bilgi';
 $lang['File/directory read error'] = 'Dosya / dizin okuma hatası';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'Dosya veya dizin erişemez (ya yok yada erişim reddedildi)';
-$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'Bir resim thumbnail (küçük resim) gerektirir. Thumbnail alt dizinde mevcut kategori dizinin "thumbnail" listesinde olmalıdır.Thumbnail yapılandırılmış thumbnail öneki ve uzantısı ile aşağıdaki listede arasında olmalıdır :';
+$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the album directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'Bir resim thumbnail (küçük resim) gerektirir. Thumbnail alt dizinde mevcut kategori dizinin "thumbnail" listesinde olmalıdır.Thumbnail yapılandırılmış thumbnail öneki ve uzantısı ile aşağıdaki listede arasında olmalıdır :';
 $lang['missing thumbnail'] = 'thumbnail eksik';
-$lang['categories deleted in the database'] = 'kategoriler veritabanından silindi';
+$lang['albums deleted in the database'] = 'veri tabanından silinen albümler';
 $lang['elements deleted in the database'] = 'elemanlar veritabanında silindi';
 $lang['images candidates for metadata synchronization'] = 'metadata senkronizasyon için görüntüleri adayları';
 $lang['elements informations synchronized with files metadata'] = 'elemanları bilgiler dosyaları ile metadata senkronize edildi';
 $lang['errors during synchronization'] = 'Senkronizasyon sırasında hatalar';
-$lang['categories added in the database'] = 'kategoriler veritabanında eklendi';
+$lang['albums added in the database'] = 'veri tabanına eklenen albümler';
 $lang['elements added in the database'] = 'elemanlar veritabanında ekledi';
 $lang['elements updated in the database'] = 'elemanlar veritabanında güncellendi';
 $lang['Search for new images in the directories'] = 'Dizinlerde yeni resimler ara';
@@ -433,14 +433,14 @@ $lang['user_status_generic'] = 'Genel';
 $lang['user_status_guest'] = 'Misafir';
 $lang['user_status_normal'] = 'Kullanıcı';
 $lang['user_status_webmaster'] = 'Site Yöneticisi';
-$lang['Virtual category'] = 'Sanal kategori';
+$lang['Virtual album'] = 'Sanal albüm';
 $lang['Waiting'] = 'Bekleyen';
 $lang['default'] = 'Varsayılan';
 $lang['Toggle \'default group\' property'] = 'Ters \'varsayılan\' özellik';
 $lang['Advanced features'] = 'Gelişmiş özellikler';
 $lang['Not linked elements'] = 'Bağlantısız elemanları';
 $lang['Specials'] = 'Özel Ürünler';
-$lang['Files with same name in more than one physical category'] = 'Birden fazla fiziksel kategoride Özdeş dosyalar isimleri';
+$lang['Files with same name in more than one physical album'] = 'birden fazla fiziksel albüm içinde aynı dosya isimleri';
 $lang['Overall'] = 'Genel bakış';
 $lang['Year'] = 'Yıl';
 $lang['Day'] = 'Gün';
@@ -457,10 +457,10 @@ $lang['Save page visits by administrators'] = 'Yöneticiler tarafından ziyaret
 $lang['An information email was sent to group "%s"'] = 'Bilgi e-postası "%s" grubuna gönderildi';
 $lang['Send an information email to group members'] = 'Grup üyelerine bilgi e-postası gönder';
 $lang['Group'] = 'Grup';
-$lang['[%s] Come to visit the category %s'] = '[%s] Kategoriyi ziyaret et %s';
+$lang['[%s] Visit album %s'] = '[%s] albümü gez%s';
 $lang['Hello,'] = 'Merhaba,';
 $lang['See you soon.'] = 'Sonra görüşürüz.';
-$lang['Come to discover the category:'] = 'Kategoriyi keşfet:';
+$lang['Discover album:'] = 'Albümü tanı:';
 $lang['Mail content'] = 'Posta içeriği';
 $lang['none'] = 'Hiç';
 $lang['high'] = 'Yüksek';
@@ -584,13 +584,13 @@ $lang['Templates configuration has been recorded.'] = 'Şablonları yapılandır
 $lang['All optimizations have been successfully completed.'] = 'Tüm optimizasyonları başarıyla tamamlanmıştır.';
 $lang['Optimizations have been completed with some errors.'] = 'ptimizasyonları bazı hatalar ile tamamlanmıştır.';
 $lang['Modify information'] = 'Bilgi değiştirme';
-$lang['edit category informations'] = 'Bu kategoride bilgileri düzenlemek';
+$lang['edit album'] = 'albüm bilgisini düzenle';
 $lang['nothing'] = 'hiçbir şey';
 $lang['overrides existing values with empty ones'] = 'boş olan değerleri geçersiz kılar';
 $lang['manage image ranks'] = 'resim rütbesini yönet';
 $lang['Manage image ranks'] = 'Resim rütbesini yönet';
 $lang['Edit ranks'] = 'Rütbeleri yönet';
-$lang['No element in this category'] = 'Bu kategoride hiçbir eleman yok';
+$lang['No element in this album'] = 'albümde eleman yok';
 $lang['Images manual order was saved'] = 'Resimlerin elle sırlandırılması kayıt edildi';
 $lang['ranks'] = 'rütbeler';
 $lang['By rank'] = 'Rütbece';
@@ -633,18 +633,18 @@ $lang['Forbid this theme to users'] = 'Bu temayı kullanıcılara yasakla';
 $lang['Set as default theme for unregistered and new users'] = 'Kayıtsız ve yeni kullanıcılar için varsayılan tema olarak ayarla';
 $lang['unknown'] = 'bilinmeyen';
 $lang['Upload Photos'] = 'Resimler Yükle';
-$lang['Drop into category'] = 'Kategori içine bırak';
+$lang['Drop into album'] = 'albüm içine bırak';
 $lang['+ Add an upload box'] = '+ Bir yükleme kutusu ekleyin';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Bir "%s" dizini açınız Piwigo kurduğunuz yerde.';
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Yetki veriniz (chmod 777) "%s" dizinine chmod 777 yapınız Piwigo kurduğunuz yerde';
-$lang['existing category'] = 'kategori mevcut';
-$lang['create a new category'] = 'yeni bir kategori yarat';
-$lang['Category name'] = 'kategori ismi';
-$lang['Category "%s" has been added'] = 'kategori "%s" eklendi';
+$lang['existing album'] = 'olan albüm';
+$lang['create a new album'] = 'albüm albüm aç';
+$lang['Album name'] = 'Albüm ismi';
+$lang['Album "%s" has been added'] = 'kategori "%s" eklendi';
 $lang['Uploaded Photos'] = 'Yüklenen resimler';
 $lang['%d photos uploaded'] = '%d resimler yüklendi';
 $lang['Privacy level set to "%s"'] = 'Gizlilik seviyesi "%s" için';
-$lang['Category "%s" now contains %d photos'] = 'kategori "%s" şimdi %d resimlerini içeriyor';
+$lang['Album "%s" now contains %d photos'] = 'kategori "%s" şimdi %d resimlerini içeriyor';
 $lang['Manage this set of %d photos'] = 'Düzenle bu dizi %d resimleri';
 $lang['Select files'] = 'Dosyaları seçin';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG dosyaları ya da ZIP arşivleri içinde JPEG dosyaları olan.';
@@ -671,8 +671,8 @@ $lang['Your configuration settings are saved'] = 'Yapılandırma ayarları kayde
 $lang['Active Themes'] = 'Aktif temalar';
 $lang['Add write access to the "%s" directory'] = 'Yazma erişimi ekle "%s" dizinine';
 $lang['Administration Home'] = 'Yönetim Ana sayfa';
-$lang['Categories ordered alphanumerically'] = 'Kategoriler alfabetik sayısal sıralaması';
-$lang['Categories ordered alphanumerically reverse'] = 'Kategoriler ters alfabetik sayısal sıralaması';
+$lang['Categories ordered alphanumerically'] = 'Albümler alfabetik sıralamada';
+$lang['Categories ordered alphanumerically reverse'] = 'Albümler ters alfabetik sıralamada';
 $lang['Change Admin Colors'] = 'Yönetim sayfa renk değişimi';
 $lang['Delete this theme'] = 'Bu temayı sil';
 $lang['Directory does not exist'] = 'Dizin yok';
diff --git a/language/tr_TR/common.lang.php b/language/tr_TR/common.lang.php
index a9874f64e..2708ce730 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 albüm güncellendi';
+$lang['%d albums updated'] = '%d albümler 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';
@@ -52,8 +52,8 @@ $lang['At least one listed rule must be satisfied.'] = 'Bir listeleme kriteri se
 $lang['At least one tag must match'] = 'Bir etiket seçilmeli';
 $lang['Author'] = 'Yazar';
 $lang['Average rate'] = 'Ortalama Puan';
-$lang['Categories'] = 'Kategoriler';
-$lang['Category'] = 'Kategori';
+$lang['Albums'] = 'Albümler';
+$lang['Album'] = 'Albüm';
 $lang['Close this window'] = 'Pencereyi Kapat';
 $lang['Complete RSS feed (images, comments)'] = ' RSS alanını tamamla  (resimler, yorumlar)';
 $lang['Confirm Password'] = 'Sifreyi Onayla';
@@ -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.'] = 'Bu RSS beslemesi bu siteden yeni resimler, güncellenen albümler, yeni yorumlar içerir. Bir RSS okuyucu ile kullanılabilir';
 $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'] = 'albümleriaç';
 $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 albüm kökündeki resimleri gösterir';
 $lang['See last users comments'] = 'Son Yorumları Gör';
 $lang['customize the appareance 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 albüm içinde';
+$lang['in %d sub-album'] = 'bu %d alt-albümiçinde';
+$lang['in %d sub-albums'] = 'bu %d alt-albümler içinde';
 $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'] = 'albümlere ve alt albümlere ait bütün elemanları 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 albümler';
+$lang['display recently updated albums'] = 'son güncellenen albümleri 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'] = 'Albüm: %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'] = 'Albüm 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'] = 'Albümlerde 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'] = 'Altalbümlerde Ara';
 $lang['Contact'] = 'iletişim';
 $lang['Show number of comments'] = 'yorumların sayısını göster';
 $lang['Show number of hits'] = 'Ziyaret 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'] = 'albüm temsilcisi oalrak ayarla';
 $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/tr_TR/upgrade.lang.php b/language/tr_TR/upgrade.lang.php
index a1440c2bb..d9cea93bd 100644
--- a/language/tr_TR/upgrade.lang.php
+++ b/language/tr_TR/upgrade.lang.php
@@ -33,7 +33,7 @@ $lang['Perform a maintenance check in [Administration>Tools>Maintenance] if you
 $lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = "Bir �nlem olarak, asagidaki eklentiler devre disi olmustur.Onlari aktif etmeden �nce eklentileri y�kseltme i�in kontrol etmelisiniz";
 $lang['Only administrator can run upgrade: please sign in below.'] = "Sadece y�netici g�ncelleme �alistirabilir: Asagidan giris yapin.";
 $lang['You do not have access rights to run upgrade'] = "G�ncelleme �alistirmak i�in yetkiniz yok";
-$lang['All sub-categories of private categories become private'] = "�zel kategorilerin t�m alt kategorileri de �zel olur";
+$lang['All sub-albums of private albums become private'] = 'Özel albümlerin alt albümleri de özel olur';
 $lang['User permissions and group permissions have been erased'] = "Kullanicilar ve gruplarin izinleri silinmistir";
 $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = "Sadece k���k resim �n eki ve site y�neticisi posta adresiniz �nceki yapilandirman kaydedili";
 $lang['In <i>%s</i>, before <b>?></b>, insert:'] = '<i>%s</i> i�ine, <b>?></b> �nce, ekleyin:';
diff --git a/language/zh_CN/admin.lang.php b/language/zh_CN/admin.lang.php
index e505daa70..fd08c4e19 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 成员';
@@ -57,15 +57,15 @@ $lang['Add group'] = '增加组';
 $lang['Add selected elements to caddie'] = '把所选的图片放到购物篮';
 $lang['Add'] = '增加';
 $lang['Allow user registration'] = '允许用户注册';
-$lang['Apply to subcategories'] = '应用于子类中';
+$lang['Apply to sub-albums'] = '应用到子相册';
 $lang['Associated'] = '关联于';
-$lang['Association to categories'] = '与类相关联';
+$lang['Association to categories'] = '相册联盟';
 $lang['Batch management'] = '分批管理';
 $lang['Caddie management'] = '购物篮管理';
 $lang['Caddie'] = '购物篮';
-$lang['Categories authorized thanks to group associations'] = '同组成员可以访问授权类';
-$lang['Categories manual order was saved'] = '类手动排序已保存';
-$lang['Category elements associated to the following categories: %s'] = '本类成员与如下类产生关联: %s';
+$lang['Albums authorized thanks to group associations'] = '相册组织授权感谢协会';
+$lang['Album manual order was saved'] = '相册手工排序已保存';
+$lang['Album elements associated to the following albums: %s'] = '相册里的相片已联合到以下相册: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = '因未知原因导致更新检测失败.';
 $lang['Check for upgrade'] = '检测更新';
 $lang['Comments for all'] = '对所有成员进行评论';
@@ -103,37 +103,37 @@ $lang['Guests'] = '游客';
 $lang['History'] = '历史';
 $lang['Informations'] = '信息';
 $lang['Install'] = '安装';
-$lang['Link all category elements to a new category'] = '把所有本类中的成员关联到一个新类';
-$lang['Link all category elements to some existing categories'] = '把所有本类中的成员关联到已存在类中';
-$lang['Linked categories'] = '关联类';
+$lang['Link all album elements to a new album'] = '链接所有相册的相片到新的相册';
+$lang['Link all album elements to some existing albums'] = '链接所有相册的相片到现有的相册';
+$lang['Linked albums'] = '已链接相册';
 $lang['Lock gallery'] = '冻结图库';
 $lang['Maintenance'] = '维护';
-$lang['Manage permissions for a category'] = '对类进行权限管理';
+$lang['Edit album permissions'] = '管理相册的权限';
 $lang['Manage permissions for group "%s"'] = '对组 "%s" 进行权限管理';
 $lang['Manage permissions for user "%s"'] = '对用户 "%s" 进行权限管理';
 $lang['Manage tags'] = '标签管理';
 $lang['Members'] = '成员';
 $lang['Metadata synchronized from file'] = '对文件进行元数据同步';
-$lang['Move categories'] = '移动类';
+$lang['Move albums'] = '移动相册';
 $lang['Move'] = '移动';
 $lang['Name'] = '名字';
 $lang['New name'] = '新名';
-$lang['New parent category'] = '新父类';
+$lang['New parent album'] = '新的父相册';
 $lang['New tag'] = '新标签';
 $lang['Number of comments per page'] = '每页评论数';
 $lang['Number of rates'] = '投票数';
 $lang['Number of thumbnails to create'] = '缩略图数';
-$lang['Only private categories are listed'] = '只列表显示私类';
+$lang['Only private albums are listed'] = '只列出私有相册';
 $lang['Operating system'] = '操作系统';
 $lang['Options'] = '选项';
-$lang['Other private categories'] = '另外私类';
+$lang['Other private albums'] = '其他私有相册';
 $lang['Page banner'] = '页标语';
-$lang['Parent category'] = '父类';
+$lang['Parent album'] = '父相册';
 $lang['Path'] = '路径';
 $lang['Permalink'] = '固定链接';
-$lang['Permalink %s has been previously used by category %s. Delete from the permalink history first'] = '链接 %s 先前已经被类 %s 使用. 请删除固定链接历史记录';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = '固定链接 %s 已被 %s 相册使用了。请先从固定链接历史记录删除。';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = '固定链接中包含了非法字符（"a-zA-Z0-9", "-", "_" ou "/"）. 禁止使用数字和以"-"开头后面紧跟数字';
-$lang['Permalink %s is already used by category %s'] = '链接 %s 已经被类 %s 使用.';
+$lang['Permalink %s is already used by album %s'] = '固定链接 %s 已被 %s 相册使用了';
 $lang['Permalink history'] = '固定链接历史记录';
 $lang['Permalinks'] = '固定链接';
 $lang['Permission denied'] = '禁止访问';
@@ -151,19 +151,19 @@ $lang['Rating'] = '投票';
 $lang['Reject All'] = '取消所有修改';
 $lang['Reject'] = '取消';
 $lang['Representant'] = '代理人';
-$lang['Representation of categories'] = '类表现';
+$lang['Representation of albums'] = '相册代表';
 $lang['Representative'] = '代理人';
 $lang['Represents'] = '代理';
 $lang['Save order'] = '保存排序';
 $lang['Save to permalink history'] = '保存到固定链接的历史记录中';
-$lang['Select at least one category'] = '至少选中一个类';
+$lang['Select at least one album'] = '选择最后一个相册';
 $lang['Select at least one picture'] = '至少选中一张图片';
 $lang['Select at least one user'] = '至少选中一个用户';
 $lang['Show info'] = '显示所有信息';
 $lang['Site manager'] = '网管';
 $lang['Status'] = '状态';
 $lang['Statistics'] = '统计';
-$lang['Storage category'] = '保存类';
+$lang['Storage album'] = '存储相册';
 $lang['Sum of rates'] = '总投票分';
 $lang['Tag "%s" already exists'] = '标签 "%s" 已存在';
 $lang['Tag "%s" was added'] = '标签 "%s" 已加入';
@@ -179,32 +179,32 @@ $lang['Validate All'] = '确认所有评论';
 $lang['Validate'] = '确认';
 $lang['Validation'] = '确认';
 $lang['Version'] = '版本';
-$lang['Virtual categories movement'] = '移动虚拟类';
-$lang['Virtual categories to move'] = '将要移动的虚拟类';
-$lang['Virtual category name'] = '虚拟类名';
+$lang['Virtual categories movement'] = '虚拟相册移动操作';
+$lang['Virtual albums to move'] = '移动虚拟相册';
+$lang['Virtual album name'] = '虚拟相册名称';
 $lang['Webmaster cannot be deleted'] = '不能删除网管帐户';
 $lang['You are running on development sources, no check possible.'] = '你运行的是源码开发版本, 不能检测最新版.';
 $lang['You cannot delete your account'] = "你不能删除自己本身帐号";
-$lang['You cannot move a category in its own sub category'] = '你不能把类移到它本身子类中';
+$lang['You cannot move an album in its own sub album'] = '您不能将一个相册移动到其子相册里';
 $lang['You need to confirm deletion'] = '你必须确认删除操作';
 $lang['add tags'] = '增加标签';
 $lang['Adviser'] = '顾问';
-$lang['associate to category'] = '关联到类';
+$lang['Associate to album'] = '联合到相册';
 $lang['associate to group'] = '关联到组';
 $lang['Authorized'] = '授权';
-$lang['Add a virtual category'] = '增加虚拟类';
-$lang['Authorize users to add comments on selected categories'] = '允许用户对所选类发表评论';
-$lang['The name of a category should not be empty'] = '类名不能为空';
-$lang['Lock categories'] = '冻结类';
-$lang['Private category'] = '私类';
-$lang['Public category'] = '公类';
+$lang['Add a virtual album'] = '添加一个虚拟相册';
+$lang['Authorize users to add comments on selected albums'] = '让用户可在所选相册里发表评论';
+$lang['The name of an album must not be empty'] = '相册名称不能为空';
+$lang['Lock albums'] = '锁定相册';
+$lang['Private'] = '私有相册';
+$lang['Public'] = '公共相册';
 $lang['Find a new representant by random'] = '随机寻找代理人';
 $lang['Public / Private'] = '公有 / 私有';
-$lang['Manage authorizations for selected categories'] = '管理所选类权限';
-$lang['Select uploadable categories'] = '选择上传类';
-$lang['Virtual category added'] = '虚拟类已加入';
-$lang['Virtual category deleted'] = '虚拟类已删除';
-$lang['Category'] = '类';
+$lang['Manage authorizations for selected albums'] = '管理所选相册的授权';
+$lang['Select uploadable albums'] = '选择可上传的相册';
+$lang['Virtual album added'] = '虚拟相册已添加';
+$lang['Virtual album deleted'] = '虚拟相册已删除';
+$lang['Album'] = '相册';
 $lang['Access type'] = '权限类型';
 $lang['Comments'] = '评论';
 $lang['Information data registered in database'] = '信息已保存到数据库中';
@@ -215,11 +215,11 @@ $lang['The number of comments a page must be between 5 and 50 included.'] = '每
 $lang['Configuration'] = '设置';
 $lang['confirm'] = '设置';
 $lang['Date'] = '日期';
-$lang['delete category'] = '删除类';
-$lang['dissociate from category'] = '取消类关联';
+$lang['delete album'] = '删除相册';
+$lang['Dissociate from album'] = '从相册里分离';
 $lang['dissociate from group'] = '取消组关联';
-$lang['edit category permissions'] = '修改类权限';
-$lang['Category informations updated successfully.'] = '类信息成功更新.';
+$lang['edit album permissions'] = '修改相册权限';
+$lang['Album updated successfully'] = '相册信息已上传成功.';
 $lang['Authorize upload'] = '允许上传图片';
 $lang['elements per page'] = '每页图片';
 $lang['elements'] = '图';
@@ -236,13 +236,13 @@ $lang['group'] = '组';
 $lang['The name of a group must not contain " or \' or be empty.'] = '组名不能包含 " 或 \' 并不能为空.';
 $lang['This name is already used by another group.'] = '组名已存在.';
 $lang['High definition'] = '高清';
-$lang['jump to category'] = '跳转到类';
+$lang['jump to album'] = '跳到相册';
 $lang['jump to image'] = '跳转到图';
 $lang['leave'] = '开锁';
 $lang['Lock'] = '上锁';
 $lang['Locked'] = '锁定';
-$lang['manage category elements'] = '管理类成员';
-$lang['manage sub-categories'] = '管理子类';
+$lang['manage album elements'] = '管理相册里的相片';
+$lang['manage sub-albums'] = '管理子相册';
 $lang['Manage'] = '管理';
 $lang['maximum height'] = '最高高度';
 $lang['maximum width'] = '最长长度';
@@ -352,15 +352,15 @@ $lang['synchronize'] = '同步';
 $lang['update the database from files'] = '根据文件对数据库进行更新';
 $lang['status'] = '状态';
 $lang['Directory'] = '文件夹';
-$lang['sub-categories'] = '子类';
+$lang['sub-albums'] = '子相册';
 $lang['synchronize metadata'] = '同步元数据';
 $lang['target'] = '目标';
 $lang['Thumbnail'] = '缩略图';
 $lang['title'] = '标题';
-$lang['Categories management'] = '类管理';
+$lang['Album list management'] = '相册管理';
 $lang['Piwigo configuration'] = '配置Piwigo';
 $lang['Piwigo administration'] = 'Piwigo管理员';
-$lang['Edit a category'] = '修改类';
+$lang['Edit album'] = '修改一个相册';
 $lang['Group management'] = '组管理';
 $lang['User list'] = '用户名单';
 $lang['Modify informations about a picture'] = '修改图片信息';
@@ -388,12 +388,12 @@ $lang['for this file format'] = '对于此文件格式';
 $lang['unit mode'] = '单一模式';
 $lang['Unlocked'] = '解锁';
 $lang['unset'] = '清空';
-$lang['Update categories informations'] = '更新类信息';
+$lang['Update albums informations'] = '上传相册信息';
 $lang['Update images informations'] = '更新图信息';
 $lang['Synchronize'] = '同步';
-$lang['reduce to single existing categories'] = '只能处理一个类';
+$lang['reduce to single existing albums'] = '减少现有的单独相册';
 $lang['Choose an option'] = '选择一个选项';
-$lang['display maximum informations (added categories and elements, deleted categories and elements)'] = '显示全部信息 (增加类, 增加图片, 删除类和图片)';
+$lang['display maximum informations (added albums and elements, deleted albums and elements)'] = '显示最全的信息 (添加相册和相片，删除相册和相片)';
 $lang['Piwigo version differs on the remote site'] = '与远端站点的Piwigo版本不相同';
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = '与远端站点文件create_listing_file.php版本和Piwigo版本必须相同';
 $lang['listing.xml file was not found'] = '没有发现listing.xml文件';
@@ -403,14 +403,14 @@ $lang['Errors caption'] = '错误说明';
 $lang['Detailed informations'] = '详细信息';
 $lang['File/directory read error'] = '文件/文件夹打开错误';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = '无法打开文件或文件夹(要么根本不存在,要么拒绝访问)';
-$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = '每个图片文件需要一个缩略图.缩略图应该存在于类文件夹下的子文件夹"thumbnail"中. 缩略图文件名应该以设置参数"prefix_thumbnail"开始, 扩展名为:';
+$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the album directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = '每个图片文件需要一个缩略图.缩略图应该存在于类文件夹下的子文件夹"thumbnail"中. 缩略图文件名应该以设置参数"prefix_thumbnail"开始, 扩展名为:';
 $lang['missing thumbnail'] = '缺少缩略图';
-$lang['categories deleted in the database'] = '类已从数据库中删除';
+$lang['albums deleted in the database'] = '相册已从数据库删除';
 $lang['elements deleted in the database'] = '图片已从数据库中删除';
 $lang['images candidates for metadata synchronization'] = '对应同步元数据的候选图片';
 $lang['elements informations synchronized with files metadata'] = '附有元数据的同步图片信息informations des images synchronisées avec les méta-données';
 $lang['errors during synchronization'] = '同步期间发生错误';
-$lang['categories added in the database'] = '增加类到数据库';
+$lang['albums added in the database'] = '相册已添加到数据库';
 $lang['elements added in the database'] = '增加图片到数据库';
 $lang['elements updated in the database'] = '更新数据库中的图片';
 $lang['Search for new images in the directories'] = '查询文件中的新图片';
@@ -435,14 +435,14 @@ $lang['user_status_generic'] = '一般用户';
 $lang['user_status_guest'] = '来宾';
 $lang['user_status_normal'] = '游客';
 $lang['user_status_webmaster'] = '网管';
-$lang['Virtual category'] = '虚拟类';
+$lang['Virtual album'] = '虚拟相册';
 $lang['Waiting'] = '等待';
 $lang['default'] = '默认';
 $lang['Toggle \'default group\' property'] = '赋予\'groupe par défaut\'默认组属性';
 $lang['Advanced features'] = '高级功能';
 $lang['Not linked elements'] = '无链接图片';
 $lang['Specials'] = '特殊';
-$lang['Files with same name in more than one physical category'] = '在好几个物理类中存在同名文件';
+$lang['Files with same name in more than one physical album'] = '同一个文件名存在于多个物理相册中';
 
 $lang['Overall'] = '全局视图';
 $lang['Year'] = '年';
@@ -461,10 +461,10 @@ $lang['Save page visits by administrators'] = '根据管理员来保存访问页
 $lang['An information email was sent to group "%s"'] = '已向组 "%s" 的所有成员发送了信息邮件';
 $lang['Send an information email to group members'] = '向组成员发送一份信息邮件';
 $lang['Group'] = '组';
-$lang['[%s] Come to visit the category %s'] = '[%s] 访问了类 %s';
+$lang['[%s] Visit album %s'] = '[%s] 参观相册 %s';
 $lang['Hello,'] = '你好,';
 $lang['See you soon.'] = '再见.';
-$lang['Come to discover the category:'] = '挖掘类:';
+$lang['Discover album:'] = '探索相册:';
 $lang['Mail content'] = '邮件内容';
 $lang['none'] = '没有任何人';
 $lang['high'] = '高';
@@ -590,13 +590,13 @@ $lang['Templates configuration has been recorded.'] = '模板设置已保存.';
 $lang['All optimizations have been successfully completed.'] = '优化成功.';
 $lang['Optimizations have been completed with some errors.'] = '有些优化发生错误.';
 $lang['Modify information'] = '修改信息';
-$lang['edit category informations'] = '编辑类信息';
+$lang['edit album'] = '修改此相册的信息';
 $lang['nothing'] = '没有内容';
 $lang['overrides existing values with empty ones'] = '用空数据来删除已存在的数据';
 $lang['manage image ranks'] = '管理图片排序';
 $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'] = '拖放进行排序';
@@ -632,18 +632,18 @@ $lang['Forbid this theme to users'] = '禁用此主题';
 $lang['Set as default theme for unregistered and new users'] = '设置为未注册者和新用户的默认主题';
 $lang['unknown'] = '未知';
 $lang['Upload Photos'] = '上传相片';
-$lang['Drop into category'] = '拖进类别';
+$lang['Drop into album'] = '拖进相册';
 $lang['+ Add an upload box'] = '+ 添加一个上传框';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = '在您的根目录下创建 "%s" 目录以完成 Piwigo 的安装';
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = '给予根目录下的 "%s" 目录写权限 (chmod 777) 以完成 Piwigo 的安装';
-$lang['existing category'] = '已存在类别';
-$lang['create a new category'] = '创建一个新类别';
-$lang['Category name'] = '类别名称';
-$lang['Category "%s" has been added'] = '类别 "%s" 已添加';
+$lang['existing album'] = '现有的相册';
+$lang['create a new album'] = '创建一个新相册';
+$lang['Album name'] = '相册名称';
+$lang['Album "%s" has been added'] = '类别 "%s" 已添加';
 $lang['Uploaded Photos'] = '相片已上传';
 $lang['%d photos uploaded'] = '%d 相片已上传';
 $lang['Privacy level set to "%s"'] = '私有级别设置为 "%s"';
-$lang['Category "%s" now contains %d photos'] = '类别 "%s" 现已包含了 %d 相片';
+$lang['Album "%s" now contains %d photos'] = '类别 "%s" 现已包含了 %d 相片';
 $lang['Manage this set of %d photos'] = '管理此设置的 %d 张照片 ';
 $lang['Select files'] = '选择文件';
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG 文件或者将 JPEG 文件放到一个 ZIP 档案里';
@@ -669,8 +669,8 @@ $lang['Your configuration settings are saved'] = '你的设置已保存';
 $lang['Active Themes'] = '已激活的主题';
 $lang['Add write access to the "%s" directory'] = '为 "%s" 目录添加写权限';
 $lang['Administration Home'] = '管理员首页';
-$lang['Categories ordered alphanumerically'] = '类别按字母排序';
-$lang['Categories ordered alphanumerically reverse'] = '类别按字母降序排序';
+$lang['Categories ordered alphanumerically'] = '相册已按字母排序';
+$lang['Categories ordered alphanumerically reverse'] = '相册已按字母倒序排序';
 $lang['Change Admin Colors'] = '更改管理员后台颜色';
 $lang['Delete this theme'] = '删除此主题';
 $lang['Directory does not exist'] = '目录不存在';
diff --git a/language/zh_CN/common.lang.php b/language/zh_CN/common.lang.php
index 788b681ad..5ee9eebdb 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 新评论';
@@ -53,8 +53,8 @@ $lang['At least one listed rule must be satisfied.'] = '至少符合一项标准
 $lang['At least one tag must match'] = '至少匹配一个标签';
 $lang['Author'] = '拥有者';
 $lang['Average rate'] = '评分';
-$lang['Categories'] = '类';
-$lang['Category'] = '类';
+$lang['Albums'] = '相册';
+$lang['Album'] = '相册';
 $lang['Close this window'] = '关闭窗口';
 $lang['Complete RSS feed (images, comments)'] = '完整RSS回馈(图片, 评论等)';
 $lang['Confirm Password'] = '重复输入密码';
@@ -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 阅读器查看new pictures, updated albums, new comments. To be used with a RSS feed reader.';
 $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'] = '在n %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'] = '播放';
diff --git a/language/zh_CN/upgrade.lang.php b/language/zh_CN/upgrade.lang.php
index 5665f2383..db68bc328 100644
--- a/language/zh_CN/upgrade.lang.php
+++ b/language/zh_CN/upgrade.lang.php
@@ -35,7 +35,7 @@ $lang['Perform a maintenance check in [Administration>Tools>Maintenance] if you
 $lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = "为了预防万一，以下插件已被停用。在您重新启用它们之前，必须先检查这些插件的更新:";
 $lang['Only administrator can run upgrade: please sign in below.'] = "只有管理员能运行升级操作：请先登录。";
 $lang['You do not have access rights to run upgrade'] = "您没有执行升级程序的权限";
-$lang['All sub-categories of private categories become private'] = "所有私有类别下的子类别都将成为私有。";
+$lang['All sub-albums of private albums become private'] = '相册里的所有子相册都成为私有';
 $lang['User permissions and group permissions have been erased'] = "用户和组的权限已被清除";
 $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = "在前一个配置操作中，只有缩略图的前缀和网站管理员的邮件地址被保存了。";
 $lang['In <i>%s</i>, before <b>?></b>, insert:'] = '在 <i>%s</i>, 之前 <b>?></b>, 插入:';