cherry-pick 50 commits from translation2.8.1

git log --reverse --oneline  translation ^master --pretty=format:"git cherry-pick --no-commit %H" a452994..c7465d6 | bash

42 files changed, 997 insertions, 835 deletions

diff --git a/language/ar_SA/help/photos_add_ftp.html b/language/ar_SA/help/photos_add_ftp.html
index 19a76afec..4d7db35b0 100644
--- a/language/ar_SA/help/photos_add_ftp.html
+++ b/language/ar_SA/help/photos_add_ftp.html
@@ -31,46 +31,38 @@
 به العديد من الميزات:</p>
 
     <pre>
-.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- album-1
-|   |   |-- album-1.1
-|   |   |   |-- album-1.1.1
-|   |   |   |   |-- album-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- album-1.1.1.2
-|   |   |   +-- album-1.1.2
-|   |   |-- album-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- album-1.3
-|   +-- album-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- local
-|-- plugins
-|-- template-extension
-|-- themes
-+-- tool</pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
 
 </li>
 
 <li>باستثناء تلك المسماة "تصغير"، "pwg_high "
-"pwg_representative"(انظر شرح أدناه)، تحت كل مجلد
+"pwg_representative" and "pwg_format"(انظر شرح أدناه)، تحت كل مجلد
 "معرض" تنتج ألبوم, لا يوجد حد في العمق,</li>
 
 <li>في الأساس ، اي عنصر يمثل ب ملف, يمكن أن يكون ملف
@@ -109,6 +101,8 @@ wedding.jpg في المثال أعلاه, بدون اختصار على الصو�
 <li>ملفات الصور المصغرة وليس من الضروري ان يكون ملحقها نفس
 الصورة المرتبطة بها (على سبيل المثال " JPG" صورة قد يكون لها ملحق " GIF").</li>
 
+<li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
 <li>من المستحسن استخدام وحدة خارجية انشاء صورة مصغرة</li>
 
 <li>إستخدام أداة إنشاء الصورة المصغرة المتكاملة في Piwigo هو
diff --git a/language/br_FR/admin.lang.php b/language/br_FR/admin.lang.php
index 79e7c1db5..c02152ebc 100755
--- a/language/br_FR/admin.lang.php
+++ b/language/br_FR/admin.lang.php
@@ -330,7 +330,7 @@ $lang['Complementary mail content'] = 'Endalc\'h ar bostel evit klokaat';
 $lang['Confirm merge'] = 'Kadarnaat ar c\'hendeuzadur';
 $lang['Check for upgrade'] = 'Sell ma vez un hizivadur';
 $lang['Check for upgrade failed for unknown reasons.'] = 'Ne oa ket posubl da sellet ma vez un hizivadur, ha n\'eo ket anavezet an abeg.';
-$lang['Check all'] = 'Gwiriañ pep tra';
+$lang['Check all'] = 'Diuzañ pep tra';
 $lang['Check automatic corrections'] = 'Gwiriañ ar reizhadurioù emgefreek';
 $lang['Check integrity'] = 'Gwiriadur an anterinded';
 $lang['Choose an option'] = 'Dibabit un dibarzh';
@@ -358,7 +358,7 @@ $lang['Delete Representant'] = 'Dilemel skeudennig ar rummad';
 $lang['display maximum informations (added albums and photos, deleted albums and photos)'] = 'Diskouez titouroù uc\'hek (rummadoù ha luc\'hskeudennoù ouzhpennet, uc\'hek (rummadoù ha luc\'hskeudennoù dilemet)';
 $lang['Include display of recent photos grouped by dates'] = 'Diskouez al luc\'hskeudennoù nevez e strolladoù dre zeiziad';
 $lang['Default display'] = 'Skrammañ dre ziouer';
-$lang['Display options'] = 'Dibarzhioù skrammañ';
+$lang['Display options'] = 'Diskouez an dibarzhioù';
 $lang['No display'] = 'Skrammadur ebet';
 $lang['display'] = 'Diskouez';
 $lang['Link all album photos to some existing albums'] = 'Liammañ pep luc\'hskeudenn er rummad da rummadoù a zo anezho';
@@ -507,7 +507,7 @@ $lang['History'] = 'Roll-istor ';
 $lang['Purge history detail'] = 'Dilemel munudoù ar roll-istor';
 $lang['Help Me'] = 'Sikour';
 $lang['Hide'] = 'Kuzhat';
-$lang['hide details'] = 'Kuzhat ar munudoù';
+$lang['hide details'] = 'kuzhat ar munudoù';
 $lang['High definition'] = 'HD (despizadur uhel)';
 $lang['High definition enabled'] = 'HD (despizadur uhel) gweredekaet';
 $lang['Maximum width'] = 'Ledander uc\'hek';
@@ -734,3 +734,160 @@ $lang['No user selected, no action possible.'] = 'Implijer ebet diuzet, obererez
 $lang['No destination tag selected'] = 'Merker pal ebet diuzet';
 $lang['No and unlock sub-albums'] = 'Ket ha dibrennañ iz-rummadoù';
 $lang['Unlocked'] = 'Dibrennet';
+$lang['There is no other language available.'] = 'N\'eus yezh-all ebet hegerz';
+$lang['There is no other plugin available.'] = 'N\'eus lugant-all ebet hegerz';
+$lang['There is no other theme available.'] = 'N\'eus tem-all ebet hegerz';
+$lang['Other plugins'] = 'Lugantoù all hegerz';
+$lang['Some themes and plugins may be not available yet.'] = 'Temoù pe lugantoù a c\'hell bezañ dihegerz evit poent';
+$lang['Options'] = 'Dibarzhioù';
+$lang['Optional URL keyword'] = 'Ger-alc\'hwez an URL war zibab';
+$lang['Operation in progress'] = 'Treterezh war-ober';
+$lang['Open user details'] = 'Digeriñ titouroù an implijer';
+$lang['show details'] = 'diskouez ar munudoù';
+$lang['Opacity'] = 'Divoullder';
+$lang['Public'] = 'Foran';
+$lang['Public / Private'] = 'Foran / Prevez';
+$lang['public'] = 'foran';
+$lang['Only private albums are listed'] = 'Ar rummadoù prevez a zo el listenn hepken';
+$lang['Other private albums'] = 'Rummadoù prevez hepken';
+$lang['Private'] = 'Prevez';
+$lang['private'] = 'prevez';
+$lang['Piwigo Publish plugin for Lightroom'] = 'Lugant embann Piwigo evit Lightroom';
+$lang['The Piwigo publish Plug-in allows you to export and synchronize photos from Lightroom directly to your Piwigo photo gallery.'] = 'Gant lugant embann Piwigo, e c\'hellit ezporzhiañ ha sinkronaat luc\'hskeudennoù war-eeun eus Lightroom d\'ho palier Piwigo.';
+$lang['On your Linux, simply install Shotwell with your package manager and the activate Piwigo publishing option.'] = 'War ho Linux, staliañ Shotwell gant ar merour-pakadoù, ha gweredekaat dibarzh embann Piwigo.';
+$lang['Obsolete Plugins'] = 'Lugantoù diamzer';
+$lang['Numeric identifier : %d'] = 'Niverenn-anaout : %d';
+$lang['Select at least two tags for merging'] = 'Evit kendeuziñ, diuzit daou merker d\'an neubeutañ';
+$lang['Please select at least two groups'] = 'Diuzit daou strollad d\'an neubeutañ';
+$lang['Select at least one album'] = 'Diuzit ur rummad d\'an neubeutañ';
+$lang['Select at least one comment'] = 'Diuzit un evezhiadenn d\'an neubeutañ';
+$lang['Select at least one photo'] = 'Diuzit ul luc\'hskeudenn d\'an neubeutañ';
+$lang['Select at least one tag'] = 'Diuzit ur merker d\'an neubeutañ';
+$lang['Select at least one user'] = 'Diuzit un implijer d\'an neubeutañ';
+$lang['Number of comments per page'] = 'Niver a evezhiadenn war pep pajenn';
+$lang['Number of albums per page'] = 'Niver a rummad war pep pajenn';
+$lang['None'] = 'Hini ebet';
+$lang['Preferences'] = 'Dibaboù';
+$lang['Position'] = 'Lec\'hiadur';
+$lang['X Position'] = 'Lec\'hiadur X';
+$lang['Y Position'] = 'Lec\'hiadur Y';
+$lang['Portrait'] = 'Poltred';
+$lang['Plugins'] = 'Lugantoù';
+$lang['Photo unreachable or no support'] = 'N\'eus ket tu diraez al luc\'hskeudenn, pe n\'eo ket embreget he furmad';
+$lang['Piwigo Administration'] = 'Mererezh Piwigo';
+$lang['Switch to clear or dark colors for administration'] = 'Cheñch livioù ar mererezh evit sklaer pe teñval';
+$lang['administrators'] = 'merourien';
+$lang['user_status_admin'] = 'Merour';
+$lang['Photo name'] = 'Anv al luc\'hskeudenn';
+$lang['Photos'] = 'Luc\'hskeudennoù';
+$lang['Photo Properties'] = 'Perzhioù al luc\'hskeudenn';
+$lang['Properties'] = 'Perzhioù';
+$lang['Toggle \'default group\' property'] = 'Cheñch perzh \'strollad dre ziouer\'';
+$lang['Photo Page'] = 'Pajenn al luc\'hskeudenn';
+$lang['Path'] = 'Hent moned';
+$lang['Parameters'] = 'Arventennoù';
+$lang['Panorama'] = 'Gwel meur';
+$lang['Pages seen'] = 'Pajennoù gwelet';
+$lang['Page end'] = 'Dibenn ar bajenn';
+$lang['Overall'] = 'Gwel a-vras';
+$lang['Page banner'] = 'Banniel ar bajenn';
+$lang['top left corner'] = 'Korn al laez a gleiz';
+$lang['top right corner'] = 'Korn an traoñ a-zehoù';
+$lang['user_status_generic'] = 'Generek';
+$lang['The webmaster has subscribed you to receiving notifications by mail.'] = 'Ar mestr-gwiad en deus koumanantet ac\'hanoc\'h da kemennoù dre bosteloù.';
+$lang['The webmaster has unsubscribed you from receiving notifications by mail.'] = 'Ar mestr-gwiad en deus digoumanantet ac\'hanoc\'h eus kemennoù dre bosteloù.';
+$lang['Warning: subscribing or unsubscribing will send mails to users'] = 'Diwallit: koumanantiñ pe digoumanantiñ a gaso postelloù d\'an implijerien';
+$lang['Subscribe to notification by mail'] = 'Koumanantiñ da kemennoù dre bosteloù.';
+$lang['Unsubscribe from notification by mail'] = 'Digoumanantiñ eus kemennoù dre bosteloù.';
+$lang['User %s [%s] was added to the subscription list.'] = 'Implijer %s [%s] lakaet e listenn ar c\'houmananterien.';
+$lang['User %s [%s] was not added to the subscription list.'] = 'Ne oa ket lakaet implijer %s [%s] e listenn ar c\'houmananterien.';
+$lang['User %s [%s] was not removed from the subscription list.'] = 'Ne oa ket tennet implijer %s [%s] eus listenn ar c\'houmananterien.';
+$lang['User %s [%s] was removed from the subscription list.'] = 'Implijer %s [%s] tennet eus listenn ar c\'houmananterien.';
+$lang['You have subscribed to receiving notifications by mail.'] = 'Koumanantet ho peus da kemennoù dre bosteloù.';
+$lang['You have unsubscribed from receiving notifications by mail.'] = 'Digoumanantet ho peus eus kemennoù dre bosteloù.';
+$lang['To unsubscribe'] = 'Digoumanantiñ';
+$lang['Subscribe'] = 'Koumanantiñ';
+$lang['Subscribe %s'] = 'Koumanantiñ %s';
+$lang['Subscribe/unsubscribe users'] = 'Koumanantiñ/digoumanantiñ implijerien';
+$lang['Subscribed'] = 'Koumanantet';
+$lang['Unsubscribed'] = 'Digoumanantet';
+$lang['Plugin list'] = 'Listenn al lugantoù';
+$lang['User list'] = 'Listenn an implijerien';
+$lang['Piwigo configuration'] = 'Kefluniadur Piwigo';
+$lang['Restore default configuration. You will lose your plugin settings!'] = 'Adsevel ar c\'hefluniadur dre ziouer. Kollet \'vo arventennoù ho lugantoù!';
+$lang['Your configuration settings are saved'] = 'Saveteet eo bet arventennoù ho c\'hefluniadur';
+$lang['Please wait...'] = 'Gortozit mar plij...';
+$lang['Piwigo Announcements Newsletter'] = 'Lizher-kelaouiñ Piwigo';
+$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Koumanantiñ %s al lizher-kelaouiñ Piwigo';
+$lang['Send'] = 'Kas';
+$lang['Tools'] = 'Ostilhoù';
+$lang['and'] = 'ha';
+$lang['between'] = 'etre';
+$lang['Year'] = 'Bloaz';
+$lang['all'] = 'holl';
+$lang['close'] = 'serriñ';
+$lang['jump to photo'] = 'mont da luc\'hskeudenn';
+$lang['new'] = 'nevez';
+$lang['nothing'] = 'netra';
+$lang['other'] = 'all';
+$lang['photos per page'] = 'luc\'hskeudenn er bajenn';
+$lang['Rename'] = 'Cheñch anv';
+$lang['Purge never used notification feeds'] = 'Skarzhañ ar c\'hemennoù n\'int ket bet implijet';
+$lang['Purge sessions'] = 'Skarzhañ an dalc\'hoù';
+$lang['Purge user cache'] = 'Skarzhañ krubuilh an implijer';
+$lang['See you soon,'] = 'Ken ar c\'hentañ,';
+$lang['Random photo'] = 'Luc\'hskeudenn dre zegouezh';
+$lang['Refresh photo set'] = 'Freskaat ar stroll luc\'hskeudennoù';
+$lang['Refresh'] = 'Freskaat';
+$lang['Posted %s on %s'] = 'Postet %s war %s';
+$lang['Reinitialize check integrity'] = 'Adderaouekaat gwiriadur an anterinded';
+$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'Sellit ouzh aotreoù kavlec\'h al lugantoù, hag e iskavlec\'hioù (CHMOD).';
+$lang['Uncheck all'] = 'Gwiriañ pep tra';
+$lang['You are running on development sources, no check possible.'] = 'Diziuzañ pep tra';
+$lang['any visitor can see this album'] = 'Pep gweladenner a c\'hell gwelet ar rummad-mañ';
+$lang['simple visitors'] = 'Gweladennerien plaen';
+$lang['visitors need to login and have the appropriate permissions to see this album'] = 'Ar gweladennerien a rank kaout an aotreoù azas evit gwelet ar rummad-mañ';
+$lang['Plugin has been successfully copied'] = 'Eilet mat eo bet al lugant';
+$lang['Piwigo cannot retrieve upgrade file from server'] = 'Ne c\'hell ket Piwigo delec\'hiañ ar restr hizivaat war ar servijer';
+$lang['Select a zone with your mouse to define a new center of interest.'] = 'Diuzit un takad gant al logodenn evit spisaat an darn talvoudus nevez.';
+$lang['The center of interest is the most meaningful zone in the photo.'] = 'An darn talvoudus a zo an takad ar pouezusañ el luc\'hskeudenn.';
+$lang['Select users...'] = 'Diuzit implijerien...';
+$lang['Select a file'] = 'Diuzit ur restr';
+$lang['Select an album'] = 'Diuzit ur rummad';
+$lang['Select files'] = 'Diuzit restroù';
+$lang['Select groups...'] = 'Diuzit strolladoù...';
+$lang['Select:'] = 'Diuzañ:';
+$lang['Selection'] = 'Diuz';
+$lang['Tag selection'] = 'Diuz merkerioù';
+$lang['on the %d selected photos'] = 'war an %d luc\'hskeudenn diuzet';
+$lang['on the %d selected users'] = 'war an %d implijer diuzet';
+$lang['selection'] = 'diuz';
+$lang['Restore'] = 'Adsevel';
+$lang['See you soon.'] = 'Ken ar c\'hentañ.';
+$lang['ReGalAndroid (RemoteGallery client for Android) is an open source (GPL v3) Piwigo client for the Android platform.'] = 'ReGalAndroid (arval RemoteGallery evit Android) a zo arval Piwigo evit savenn Android, e kod mammennoù a zo digor (GPL v3).';
+$lang['Shotwell is an open source digital photo organizer that runs on Linux. It is the default photo manager in Ubuntu and Fedora.'] = 'Shotwell a zo un dibaber luc\'hskeudennoù, e kod mammennoù a zo digor, mont a ra en-dro war Linux. An dibaber dre ziouer eo e Ubuntu ha Fedora.';
+$lang['Webmaster status is required.'] = 'Ret eo kaout statud ar mestr-gwiad.';
+$lang['Status'] = 'Statud';
+$lang['User status'] = 'Statud an implijer';
+$lang['status'] = 'statud';
+$lang['Show %s users'] = 'Diskouez %s implijer';
+$lang['Show info'] = 'Diskouez an titouroù';
+$lang['Showing %s to %s of %s users'] = 'O-tiskouez %s betek %s etre %s implijer';
+$lang['Remote'] = 'A-bell';
+$lang['Set as default language for unregistered and new users'] = 'Lakaat evel ar yezh dre ziouer evit ar re n\'int ket enrollet, hag an implijerien nevez';
+$lang['Set as default theme for unregistered and new users'] = 'Lakaat evel an tem dre ziouer evit ar re n\'int ket enrollet, hag an implijerien nevez';
+$lang['Set author'] = 'Lakaat an oberour';
+$lang['Set creation date'] = 'Lakaat an deiziad krouidigezh';
+$lang['Set title'] = 'Lakaat an titl';
+$lang['set to'] = 'lakaat da';
+$lang['unset'] = 'dilemel';
+$lang['Send connection settings by email'] = 'Kas an arventennoù kevreañ dre bostel';
+$lang['Send mail on HTML format'] = 'Kas ar bostel e furmad HTML';
+$lang['Send mail to users'] = 'Kas ur bostel d\'an implijerien';
+$lang['To send ?'] = 'Da gas ?';
+$lang['Read Piwigo Documentation'] = 'Lennit teuliadur Piwigo';
+$lang['Send mail as'] = 'Kas ar bostel evel';
+$lang['Quick Local Synchronization'] = 'Sinkroneladur lec\'hel prim';
+$lang['even already synchronized photos'] = 'memes al luc\'hskeudennoù sinkronelaet';
+$lang['synchronize files structure with database'] = 'Sinkronelaat framm ar restroù gant an diaz roadennoù';
+$lang['Predefined filter'] = 'Sil raktermenet';
\ No newline at end of file
diff --git a/language/ca_ES/admin.lang.php b/language/ca_ES/admin.lang.php
index 3f77ae145..0561d93e1 100644
--- a/language/ca_ES/admin.lang.php
+++ b/language/ca_ES/admin.lang.php
@@ -650,7 +650,7 @@ $lang['Error on file "%s" : %s'] = 'Error a l\'arxiu "%s": %s';
 $lang['automatic order'] = 'Ordre automàtic';
 $lang['manual order'] = 'ordre manual';
 $lang['Albums automatically sorted'] = 'Àlbums ordenats automàticament';
-$lang['Batch Manager'] = 'Gestor per lots';
+$lang['Batch Manager'] = 'Gestor de pocessamet per lots';
 $lang['include child albums'] = 'incloure els sub-àlbums';
 $lang['Selection'] = 'Selecció';
 $lang['Action'] = 'Acció';
diff --git a/language/ca_ES/help/photos_add_ftp.html b/language/ca_ES/help/photos_add_ftp.html
index 7d0a90e55..3037f7384 100755
--- a/language/ca_ES/help/photos_add_ftp.html
+++ b/language/ca_ES/help/photos_add_ftp.html
@@ -27,32 +27,43 @@
   
     <pre>
 galleries
-|-- casament
-|   |-- celebracio
-|   |   |-- sortida
-|   |   |   |-- pol-sol.jpg
-|   |   |   +-- sara-sola.jpg
-|   |   +-- arrivada
-|   |       +-- pol-i-sara.jpg
-|   +-- festa
-|       |-- ball001.jpg
-|       |-- ball002.jpg
-|       +-- ball003.jpg
-+-- llunademel
-    |-- hotel.png
-    |-- video-avio.avi
-    +-- pwg_representacio
-        +-- video-avio.jpg
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
   
-  <li>A excepci&oacute; de "pwg_representative" (vegeu les explicacions a sota), cada directori en "galleries" produeix un &agrave;lbum. No hi ha l&iacute;mit quan a profunditat, &eacute;s a dir, es poden crear &agrave;lbums i sub-&agrave;lbums a voluntat.</li>
+  <li>A excepci&oacute; de "pwg_representative" and "pwg_format" (vegeu les explicacions a sota), cada directori en "galleries" produeix un &agrave;lbum. No hi ha l&iacute;mit quan a profunditat, &eacute;s a dir, es poden crear &agrave;lbums i sub-&agrave;lbums a voluntat.</li>
 
   <li>B&agrave;sicament, un element est&agrave; representat per un arxiu. Un arxiu pot ser un element per a Piwigo si la seva extensi&oacute; &eacute;s entre la llista de par&agrave;metres de configuraci&oacute; <code>file_ext</code> (veure arxiu <span class="filename">include/config.inc.php</span>). Un arxiu pot ser una imatge si la seva extensi&oacute; &egrave;s entre el par&agrave;metre de configuraci&oacute; <code>picture_ext</code>.</li>
 
   <li>No es representen amb una icona per defecte elements com ara arxius de v&iacute;deo, sons, textos d'arxius, i altres extensions. Opcionalment, es pot associar una miniatura i un arxiu de representanci&oacute; (veure el video-avio.avi en l'exemple anterior).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li>Una vegada que les fotos estan ben col &middot; locades en els directoris, aneu a: <span class="pwgScreen">Gestionar (al Tauler de control) &raquo; Eines &raquo; Sincronitzar</span></li>
 </ul>
 </fieldset>
diff --git a/language/cs_CZ/help/photos_add_ftp.html b/language/cs_CZ/help/photos_add_ftp.html
index e2d9a57dc..28c6c4135 100644
--- a/language/cs_CZ/help/photos_add_ftp.html
+++ b/language/cs_CZ/help/photos_add_ftp.html
@@ -1,102 +1,53 @@
 <fieldset>
   <legend>Rychlý návod</legend>
-
   <ol>
-  <li>Vytvořte kategorii (adresář) na Vašem počítači.</li>  
-
-  <li>Zkopírujte nějaké fotografije do tohoto adresáře, změňte jejich velikost pro zobrazení na web. <em>Varování</em>: názvy adresářů a souborů musí obsahovat pouze písmena, čísla, "-", "_" or ".". Žádné mezery nebo znaky s diakritikou.</li>
-
-  <li>Pomocí FTP, zkopírujte Váš adresář do adresáře "galleries" vaší instalace  Piwigo.</li>
-
-  <li>Přihlašte se do Vaší Piwigo galerie a přejděte na <span class="pwgScreen">Administrace &raquo; Nástroje &raquo; Náhledy</span> abyste vytvořili chybějící náhledy.</li>
-
-  <li>Jděte na <span class="pwgScreen">Adminstrace</span> a stiskněte velké tlačítko Rychlá místní synchronizace.</li>
+    <li>Vytvořte kategorii (adresář) na svém počítači.</li>
+    <li>Zkopírujte nějaké fotografije do tohoto adresáře, změňte jejich velikost pro zobrazení na web. <em>Varování</em>: název kteréhokoliv adresáře a souboru smí obsahovat pouze alfanumerické znaky, „-“, „_“ a „.“. Mezery nebo znaky s diakritikou nejsou povoleny.</li>
+    <li>Pomocí FTP zkopírujte tento adresář do adresáře "galleries" své instalace Piwigo.</li>
+    <li>Přihlašte se do administrace své galerie Piwigo a přejděte na <span class="pwgScreen">Administrace</span> a stiskněte velké tlačítko Rychlá místní synchronizace.</li>
   </ol>
-
-Gratulujeme! Právě jste vytvořili vaší první galerii fotografií ve Vaší Piwigo galerii.
+  Gratulujeme! Právě jste vytvořili svou první galerii fotografií ve své galerii Piwigo.
 </fieldset>
-
 <fieldset>
-  <legend>Organizace souboru a adresářů</legend>
-
+  <legend>Organizace souborů a adresářů</legend>
   <ul>
-
     <li>
-
-    <p>Adresáře kategorií jsou v Piwigo adresáři 
-    "galleries". tady je ukázka malé adresářové struktury Piwigo (která ale využívá hodně vlastností Piwigo):</p>
-
+      <p>Adresáře kategorií jsou v adresáři
+      "galleries". Zde je ukázka adresářové struktury malé galerie Piwigo (která ale využívá hodně vlastností Piwigo):</p>
       <pre>
-.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- kategorie-1
-|   |   |-- kategorie-1.1
-|   |   |   |-- kategorie-1.1.1
-|   |   |   |   |-- kategorie-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- svatba.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-svatba.jpg
-|   |   |   |   |   +-- svatba.jpg
-|   |   |   |   +-- kategorie-1.1.1.2
-|   |   |   +-- kategorie-1.1.2
-|   |   |-- kategorie-1.2
-|   |   |   |-- slon.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-slon.jpg
-|   |   +-- kategorie-1.3
-|   +-- kategorie-2
-|       |-- selatko.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-selatko.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool</pre>
-
+  galleries
+  |-- wedding
+  |   |-- celebration
+  |   |   |-- arrival
+  |   |   |   |-- paul-alone.jpg
+  |   |   |   +-- sarah-alone.jpg
+  |   |   +-- departure
+  |   |       +-- paul-and-sarah.jpg
+  |   +-- party
+  |       |-- dancers001.jpg
+  |       |-- dancers002.jpg
+  |       +-- dancers003.jpg
+  +-- honeymoon
+  |   |-- hotel.png
+  |   |-- video-from-plane.avi
+  |   +-- pwg_representative
+  |       +-- video-from-plane.jpg
+  +-- photoshoot
+      |-- img0001.jpg
+      |-- img0002.jpg
+      +-- pwg_format
+          |-- img0001.cr2
+          |-- img0001.cmyk.jpg
+          |-- img0001.zip
+          |-- img0002.cr2
+          +-- img0002.cmyk.jpg
+      </pre>
     </li>
-
-  <li>Kromě adreářů pojmenovaných "thumbnail", "pwg_high" nebo "pwg_representative" (čtěte vysvětlení níže), každý adresář v "galleries" vytvoří kategorii. Není zde omezení hloubky adresářů.</li>
-
-  <li>Každý element kategorie je reprezentován souborem. Soubor může být elementem Piwigo pokud jeho přípona odpovídá parametru konfigurace <code>file_ext</code>
-  (viz. soubor <span
-  class="filename">include/config_default.inc.php</span>). Soubor může být obrázek (fotografie) pokud jeho přípona je uvedena v parametru <code>picture_ext</code>.</li>
-
-  <li>Obrázky musí mít přiřazen náhled (viz. sekce o náhledech níže)</li>
-
-  <li>Obrázky mohou mít přiřazenu verzi ve vysoké kvalitě. Jako například svatba.jpg v příkladu výše. Verze ve vysoké kvalitě nemá, na rozdíl od náhledu, žádný prefix v názvu.</li>
-
-  <li>Elementy které nejsou obrázky (video, zvuky, textové sobubory, cokoli chcete...) mají jako výchozí náhled ikonu, které odpovídá jejich příponě. Volitelně můžete přiřadit náhled a reprezentativní soubor (viz. video.avi v příkladu výše).</li>
-
-  <li><em>Varování</em>: názvy adresářů a souborů musí obsahovat pouze písmena, čísla, "-", "_" or ".". Žádné mezery nebo znaky s diakritikou.</li>
-
-  <li>Když jsou elementy, obrázky, náhledy a reprezentativní soubory umístěny v adresářové struktuře přejděte na: <span class="pwgScreen">Administrace &raquo; Kategorie &raquo;
-  Synchronizace</span></li>
-
-</ul>
-</fieldset>
-
-<fieldset>
-  <legend>Náhledy</legend>
-<ul>
-
-  <li>Všechny obrázky (fotografie) musí mít přiřazen náhled.</li>
-
-  <li>Náhledy jsou umístěny v podadresáři "thumbnail", který je v adresáři kategorie. Náhled má stejný název jako jemu odpovídající obrázek, s prefixem podle konfiguračního parametru <code>prefix_thumbnail</code> (viz. <span class="filename">include/config.inc.php</span>).</li>
-
-  <li>Náhled nemusí mít nutně stejnou příponu jako jemu odpovídající obrázek (například ".jpg" obrázek může mít náhled s ".GIF" příponou).</li>
-
-  <li>Doporučujeme použít externí aplikaci protvorbu náhledů.</li>
-
-  <li>Vytvářená náhledů pomocí Piwigo může vést ke špatné kvalitě vytvořených náhledů, protože ta závisí na zdrojích serveru (a toto může být na sdílených serverech (webhosting) problém).
-
-  <li>Pokud budete přesto vytvářet náhledy pomocí Piwigo na serveru, tak musíte povolit přístup pro zápis pro všechny v adresáři "galleries" a všech podadresářích.</li>
-
+    <li>Kromě adreářů pojmenovaných „thumbnail“, „pwg_high“, „pwg_format“ a „pwg_representative“ (jejich funkce vysvětleny níže) vytvoří každý adresář v „galleries“ kategorii. Není zde omezení hloubky adresářů.</li>
+    <li>Každý element kategorie je reprezentován souborem. Soubor může být elementem kategorie, pokud je jeho přípona mezi parametry konfigurace <code>file_ext</code> (vizte soubor <span class="filename">include/config_default.inc.php</span>). Soubor může být obrázek (fotografie), pokud je jeho přípona mezi parametry <code>picture_ext</code>.</li>
+    <li>Elementy, které nejsou obrázky (video, zvuky, textové soubory, cokoli chcete...), mají jako výchozí náhled ikonu, která odpovídá jejich příponě. Volitelně můžete neobrázkovému souboru přiřadit náhled a reprezentativní soubor (vizte „video-from-plane.avi“ a jeho reprezentační obrázek „video-from-plane.jpg“ ve složce „pwg_representative“ v příkladu výše).</li>
+    <li><em>Varování</em>: název kteréhokoliv adresáře a souboru smí obsahovat pouze alfanumerické znaky, „-“, „_“ a „.“. Mezery nebo znaky s diakritikou nejsou povoleny.</li>
+    <li>Více formátů: pro jeden obrázek je možné mít v galerii Piwigo více formátů. V příkladu výše jsou k obrázkům „img0001.jpg“ a „img0002.jpg“ k dispozici tři další formáty ve složce „pwg_formats“. Alternativní formáty je pak možné stáhnout přes tlačítko „Stáhnout“ na stránce daného obrázku. Tuto funkcionalitu můžete aktivovat ve své lokální konfiguraci (za použití doplňku „LocalFiles editor“) definováním seznamu povolených formátů, např.: <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code>.</li>
+    <li>Když jsou obrázky umístěny v adresářové struktuře, přejděte na: <span class="pwgScreen">Administrace &raquo; Nástroje &raquo; Synchronizace</span> a synchronizujte adresáře s databází.</li>
   </ul>
 </fieldset>
\ No newline at end of file
diff --git a/language/da_DK/common.lang.php b/language/da_DK/common.lang.php
index 7f1f6bf9b..69d8c6b02 100644
--- a/language/da_DK/common.lang.php
+++ b/language/da_DK/common.lang.php
@@ -194,7 +194,7 @@ $lang['included'] = 'medtaget';
 $lang['Invalid password!'] = 'Forkert adgangskode!';
 $lang['Language']='Sprog';
 $lang['last %d days'] = 'seneste %d dage';
-$lang['Last'] = 'Seneste';
+$lang['Last'] = 'Sidste';
 $lang['Logout'] = 'Log af';
 $lang['obligatory'] = 'obligatorisk';
 $lang['display a calendar by creation date'] = 'viser en kalender over oprettelsesdatoer';
@@ -231,7 +231,7 @@ $lang['Click on the photo to see it in high definition'] = 'Klik på fotografiet
 $lang['Show file metadata'] = 'Vis fotografiets metadata';
 $lang['Powered by'] = 'Drives af';
 $lang['Preferences'] = 'Indstillinger';
-$lang['Previous'] = 'Tidligere';
+$lang['Previous'] = 'Forrige';
 $lang['Random photos'] = 'Tilfældige fotografier';
 $lang['display a set of random photos'] = 'vis et sæt tilfældigt valgte fotografier';
 $lang['Recent albums'] = 'Nyeste albummer';
diff --git a/language/da_DK/help/photos_add_ftp.html b/language/da_DK/help/photos_add_ftp.html
index ecac36763..66f47e620 100755
--- a/language/da_DK/help/photos_add_ftp.html
+++ b/language/da_DK/help/photos_add_ftp.html
@@ -27,27 +27,36 @@
 
     <pre>
 galleries
-|-- bryllup
-|   |-- fejring
-|   |   |-- ankomst
-|   |   |   |-- mads-alene.jpg
-|   |   |   +-- mette-alene.jpg
-|   |   +-- afrejse
-|   |       +-- mads-og-mette.jpg
-|   +-- fest
-|       |-- dansende001.jpg
-|       |-- dansende002.jpg
-|       +-- dansende003.jpg
-+-- bryllupsrejse
-    |-- hotel.png
-    |-- video-fra-fly.avi
-    +-- pwg_representative
-        +-- video-fra-fly.jpg
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
 
-  <li>Bortset fra "pwg_representative" (se forklaring herunder), genererer hver mappe under "galleries" et album. Der er ingen begrænsning på hvor mange niveauer, der kan være.</li>
+  <li>Bortset fra "pwg_representative" and "pwg_format" (se forklaring herunder), genererer hver mappe under "galleries" et album. Der er ingen begrænsning på hvor mange niveauer, der kan være.</li>
 
   <li>Grundlæggende repræsenteres et element af en fil. En fil kan være et 
   Piwigo-element, hvis dets filendelse er blandt mulighederne angivet i opsætningsparameteret
@@ -58,6 +67,8 @@ galleries
   <li>Ingen fotoelementer (video, lyde, tekstfiler, alt muligt andet ...) er som standard repræsenteret af en ikon 
   svarende til filendelsen. Man kan valgfrit associere et miniaturebillede og repræsentativ fil (se video.avi i eksemplet herover).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Advarsel</em>: Navnene på mapper og filer må kun indeholde bogstaver, tal, "-", "_" eller ".". Ingen mellemrum eller accenttegn.</li>
 
   <li>Når fotografierne er korrekt placeret i mapperne, går man til: <span class="pwgScreen">Administration &raquo; Værktøjer &raquo;
diff --git a/language/de_DE/admin.lang.php b/language/de_DE/admin.lang.php
index cbc6929e5..bd5a7556a 100644
--- a/language/de_DE/admin.lang.php
+++ b/language/de_DE/admin.lang.php
@@ -23,12 +23,12 @@
 
 $lang['%d association'] = '%d Element wird angezeigt';
 $lang['%d associations'] = '%d Verknüpfungen';
-$lang['%d album including'] = '%d Album inbegriffen, ';
-$lang['%d albums including'] = '%d Alben inbegriffen, ';
+$lang['%d album including'] = '%d Album enthalten, ';
+$lang['%d albums including'] = '%d Alben enthalten, ';
 $lang['%d physical'] = 'davon %d physisch';
 $lang['%d physicals'] = 'davon %d physische';
 $lang[' and %d virtual'] = ' und %d virtuell';
-$lang[' and %d virtuals'] = ' und %d virtuelle';
+$lang[' and %d virtuals'] = ' und %d virtuell';
 $lang['%d album moved'] = '%d Album verschoben';
 $lang['%d albums moved'] = '%d Alben verschoben';
 $lang['%d group'] = '%d Gruppe';
@@ -91,7 +91,7 @@ $lang['Group name'] = 'Gruppenname';
 $lang['Groups'] = 'Gruppen';
 $lang['Guests'] = 'Gäste';
 $lang['History'] = 'Statistik';
-$lang['Informations'] = 'Informationen';
+$lang['Informations'] = 'Benachrichtigung';
 $lang['Install'] = 'Installieren';
 $lang['Link all album photos to a new album'] = 'Alle Album-Fotos mit einem neuen Album verknüpfen';
 $lang['Link all album photos to some existing albums'] = 'Alle Album-Fotos mit einem existierenden Album verknüpfen';
@@ -287,7 +287,7 @@ $lang['Include display of recent photos grouped by dates'] = 'Die neuesten Bilde
 $lang['Available only with HTML format'] = 'Nur verfügbar, wenn die Benachrichtigungen im HTML-Format verschickt werden';
 $lang['no write access'] = 'kein Schreibzugriff';
 $lang['Permissions'] = 'Zugriffsrechte';
-$lang['private'] = 'private';
+$lang['private'] = 'privat';
 $lang['public'] = 'öffentlich';
 $lang['Purge never used notification feeds'] = 'Nicht verwendete Benachrichtigungen löschen';
 $lang['Purge sessions'] = 'Sitzungen löschen';
@@ -394,9 +394,9 @@ $lang['An information email was sent to group "%s"'] = 'Eine Info-E-Mail wurde a
 $lang['Send an information email to group members'] = 'Eine Info-E-Mail an die Mitglieder dieser Gruppe senden';
 $lang['Group'] = 'Gruppe';
 $lang['[%s] Visit album %s'] = '[%s] Album %s ansehen';
-$lang['Hello,'] = 'Hallo,';
-$lang['See you soon.'] = 'Bis bald.';
-$lang['Discover album:'] = 'Entdecken Sie das Album:';
+$lang['Hello,'] = 'Guten Tag!';
+$lang['See you soon.'] = 'Bis bald!';
+$lang['Discover album:'] = 'Entdecken Sie dieses Album:';
 $lang['Mail content'] = 'Text der E-Mail';
 $lang['none'] = 'nichts';
 $lang['high'] = 'hoch';
diff --git a/language/de_DE/common.lang.php b/language/de_DE/common.lang.php
index e66fac988..5ace3c36e 100644
--- a/language/de_DE/common.lang.php
+++ b/language/de_DE/common.lang.php
@@ -64,8 +64,8 @@ $lang['Connection settings'] = 'Anmeldungseinstellungen';
 $lang['Login'] = 'Anmeldung';
 $lang['Contact webmaster'] = 'E-Mail an den Webmaster';
 $lang['Create a new account'] = 'Neues Benutzerkonto erstellen';
-$lang['Created on'] = 'Erstellungsdatum';
-$lang['Creation date'] = 'Erstellungsdatum';
+$lang['Created on'] = 'Erstellt am';
+$lang['Creation date'] = 'Aufnahmedatum';
 $lang['Current password is wrong'] = 'Aktuelles Passwort ist falsch.';
 $lang['Dimensions'] = 'Abmessungen';
 $lang['Display'] = 'Anzeige';
@@ -272,7 +272,7 @@ $lang['return to the display of all photos'] = 'Zurück zu allen Fotos';
 $lang['the beginning'] = 'Beginn';
 $lang['Thumbnails'] = 'Vorschaubilder';
 $lang['Menu'] = 'Menü';
-$lang['A comment on your site'] = 'Ein Kommentar zu Ihrer Fotogalerie.';
+$lang['A comment on your site'] = 'Ein Kommentar zu Ihrer Fotogalerie';
 $lang['today'] = 'heute';
 $lang['Update your rating'] = 'Ihre Bewertung aktualisieren';
 $lang['the username must be given'] = 'Benutzername fehlt';
diff --git a/language/de_DE/help/photos_add_ftp.html b/language/de_DE/help/photos_add_ftp.html
index 5dcee028c..8a0a07b88 100644
--- a/language/de_DE/help/photos_add_ftp.html
+++ b/language/de_DE/help/photos_add_ftp.html
@@ -37,27 +37,36 @@
     </p>
     <pre>
 galleries
-|-- Hochzeit
-|   |-- Trauung
-|   |   |-- Ankunft
-|   |   |   |-- Paul.jpg
-|   |   |   +-- Sarah.jpg
-|   |   +-- Abfahrt
-|   |       +-- Paul-und-Sarah.jpg
-|   +-- Feier
-|       |-- tanzen001.jpg
-|       |-- tanzen002.jpg
-|       +-- tanzen003.jpg
-+-- Flitterwochen
-    |-- Hotel.png
-    |-- Video-aus-dem-Flugzeug.avi
-    +-- pwg_representative
-        +-- Video-aus-dem-Flugzeug.jpg
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 </li>
 
 <li>
- Außer dem Verzeichnisse "pwg_representative" erzeugt jedes 
+ Außer dem Verzeichnisse "pwg_representative" und "pwg_format" erzeugt jedes 
  Unterverzeichnis ein neues Album in der Galerie.
  Es kann beliebig viele Unterverzeichnisse (Unteralben) geben.
 </li>
@@ -81,6 +90,8 @@ galleries
    class = "filename">Video-aus-dem-Flugzeug.jpg</span> im Beispiel oben).
 </li>
 
+<li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
 <li>
   <em>Achtung</em>: Der Name für ein Verzeichnis oder eine Datei darf
   nur aus Buchstaben, Zahlen, "-", "_" und "." bestehen. Leerzeichen, Umlaute, "ß" 
diff --git a/language/el_GR/help/photos_add_ftp.html b/language/el_GR/help/photos_add_ftp.html
index e29c2a440..07b1458ef 100755
--- a/language/el_GR/help/photos_add_ftp.html
+++ b/language/el_GR/help/photos_add_ftp.html
@@ -26,28 +26,37 @@
     με πολλά χαρακτηριστικά γνωρίσματα):</p>
 
     <pre>
-Γκαλλερί

-|-- γάμος

-|   |-- εορτασμός

-|   |   |-- άφιξη

+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
 |   |   |   |-- paul-alone.jpg
 |   |   |   +-- sarah-alone.jpg
-|   |   +-- αναχώρηση

+|   |   +-- departure
 |   |       +-- paul-and-sarah.jpg
-|   +-- πάρτυ

+|   +-- party
 |       |-- dancers001.jpg
 |       |-- dancers002.jpg
 |       +-- dancers003.jpg
-+-- μήνας του μέλιτος

-    |-- hotel.png

-    |-- video-from-plane.avi

-    +-- pwg_representative

-        +-- video-from-plane.jpg

++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
 
-  <li>Εκτός από "pwg_representative" (βλέπε τις εξηγήσεις παρακάτω), κάθε κατάλογο κάτω απο το "galleries" παράγει ένα λεύκωμα. Δεν υπάρχει όριο στο βάθος.</li>

+  <li>Εκτός από "pwg_representative" and "pwg_format" (βλέπε τις εξηγήσεις παρακάτω), κάθε κατάλογο κάτω απο το "galleries" παράγει ένα λεύκωμα. Δεν υπάρχει όριο στο βάθος.</li>
 
   <li>Βασικά, κάθε στοιχείο αντιπροσωπεύεται από ένα αρχείο. Ένα αρχείο μπορεί να είναι ένα
   στοιχείο Piwigo εάν η επέκταση της είναι μεταξύ <code>file_ext</code> των
@@ -58,6 +67,8 @@
 
   <li>Δεν υπάρχουν στοιχεία φωτογραφία (βίντεο, ήχους, κείμενα αρχείου, ό, τι θέλετε ...) αντιπροσωπεύονται από προεπιλογή από ένα εικονίδιο που αντιστοιχεί στο όνομα επέκτασης αρχείου. Προαιρετικά, μπορείτε να συνδέσετε μια μικρογραφία και ένα αντιπροσωπευτικό αρχείο (βλέπε video.avi στο παραπάνω παράδειγμα).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Προειδοποίηση</em>: το όνομα των αρχείων και καταλόγων πρέπει να περιέχει μόνο γράμματα, αριθμούς, "-", "_" ή ".". Όχι κενά διαστήματα, ούτε τονιζόμενους χαρακτήρες.</li>
 
   <li>Αφού οι φωτογραφίες είναι σωστά τοποθετημένους
diff --git a/language/es_ES/help/photos_add_ftp.html b/language/es_ES/help/photos_add_ftp.html
index 9bc1dda1c..7c6babcf1 100644
--- a/language/es_ES/help/photos_add_ftp.html
+++ b/language/es_ES/help/photos_add_ftp.html
@@ -17,27 +17,38 @@
 			utilizando muchas características):</p>
     <pre>
 galleries
-			|-- boda
-			|   |-- celebracion
-			|   |   |-- llegada
-			|   |   |   |-- paul-solo.jpg
-			|   |   |   +-- sara-sola.jpg
-			|   |   +-- salida
-			|   |       +-- paul-y-sara.jpg
-			|   +-- fiesta
-			|       |-- baile001.jpg
-			|       |-- baile002.jpg
-			|       +-- baile003.jpg
-			+-- luna-de-miel
-				|-- hotel.png
-				|-- video-desde-el-avion.avi
-				+-- pwg_representative
-					+-- video-desde-el-avion.jpg
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 		</li>
-		<li>A excepción de "pwg_representative" (ver explicaciones debajo), cada subdirectorio de "galleries" genera un álbum. No hay limite de profundidad en cuanto el número de subniveles a crear.</li>
+		<li>A excepción de "pwg_representative" o "pwg_format" (ver explicaciones debajo), cada subdirectorio de "galleries" genera un álbum. No hay limite de profundidad en cuanto el número de subniveles a crear.</li>
 		<li>Fundamentalmente, cada elemento es representado por un archivo. Piwigo sólo reconocerá los archivos cuyas extensiones figuren en los parámetros de configuración <code>file_ext</code> (Ver archivo <span class="filename">include/config_default.inc.php</span>). Para Piwigo, un archivo de imagen será reconocido como una imagen sólo si su extensión se encuentra dentro de los parámetros de configuración <code>picture_ext</code>.</li>
 		<li>Los elementos que no son imágenes (vídeos, sonidos, archivos de texto, todo lo que quieras...) son representados de forma predeterminada por iconos que corresponden a la extensión cada archivo. Opcionalmente, puedes asociar una miniatura y un archivo de representación (ver video.avi en el ejemplo anterior).</li>
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
 		<li>Una vez todas las fotos estén organizadas y correctamente situadas en sus correspondientes carpetas, ir a <span class="pwgScreen">Administración &raquo; Herramientas &raquo; Sincronizar</span>.</li>
 	</ul>
 </fieldset>
diff --git a/language/fr_CA/help/photos_add_ftp.html b/language/fr_CA/help/photos_add_ftp.html
index e3bfad18b..39b4fb3aa 100644
--- a/language/fr_CA/help/photos_add_ftp.html
+++ b/language/fr_CA/help/photos_add_ftp.html
@@ -4,16 +4,14 @@
 <ol>
   <li>Créez un répertoire sur votre ordinateur.</li>
 
-  <li>Copiez des photos à l'intérieur de ce répertoire, puis redimensionnez-les pour un affichage sur le web. <em>Attention</em> : le nom des répertoires et des fichiers ne doit contenir que des lettres, des chiffres et les caractères  "-", "_" ou ".". Pas d'espace ou de caractères accentués.</li>
+  <li>Copiez des photos à l'intérieur de ce répertoire. <em>Attention</em> : le nom des répertoires et des fichiers ne doit contenir que des lettres, des chiffres et les caractères  "-", "_" ou ".". Pas d'espace ou de caractères accentués.</li>
 
   <li>Avec un client FTP, copiez le répertoire dans le répertoire "galleries" de votre installation de Piwigo.</li>
 
-  <li>Connectez-vous à votre galerie Piwigo et rendez-vous sur <span class="pwgScreen">Administration &raquo; Images &raquo; Miniatures</span> pour créer les miniatures manquantes.</li>
-
-  <li>Rendez-vous sur <span class="pwgScreen">Administration</span> et cliquez sur le gros bouton de synchronisation.</li>
+  <li>Connectez-vous à votre galerie Piwigo, rendez-vous sur <span class="pwgScreen">Administration</span> et cliquez sur le gros bouton de synchronisation.</li>
 </ol>
 
-<p>Bravo ! Vous avez créé avec succès la première catégorie de votre galerie.</p>
+<p>Bravo ! Vous avez créé avec succès le premier album de votre galerie.</p>
 
 </fieldset>
 
@@ -41,81 +39,50 @@ galleries
 |       |-- discours002.jpg
 |       +-- discours003.jpg
 +-- voyage-de-noces
-    |-- hotel.png
-    |-- video-decollage-avion.avi
-    +-- pwg_representative
-        +-- video-decollage-avion.jpg
+|   |-- hotel.png
+|   |-- video-decollage-avion.avi
+|   +-- pwg_representative
+|       +-- video-decollage-avion.jpg
++-- seance-photographe
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
   
-  <li>A l'exception de celui appelé "pwg_representative", chaque répertoire dans "galleries" génère un album. Le nombre de niveaux (profondeur) n'est pas limité.</li>
+  <li>A l'exception de "pwg_representative" et "pwg_format", chaque répertoire dans "galleries" génère un album. Le nombre de niveaux (profondeur) n'est pas limité.</li>
 
-  <li>Fondamentalement, un élément est représenté par un fichier. Pour Piwigo, un fichier peut être un élément si son extension figure dans la liste du paramètre de configuration <code>file_ext</code> (voir
+  <li>Fondamentalement, une photo est représentée par un fichier. Pour Piwigo, un fichier peut être une photo si son extension figure dans la liste du paramètre de configuration <code>file_ext</code> (voir
 fichier <span class="filename">include/config.inc.php</span>). Un fichier
-peut être une image si son extension figure dans la liste du paramètre de configuration
+peut être une photo si son extension figure dans la liste du paramètre de configuration
 <code>picture_ext</code>.</li>
 
-  <li>Les éléments de type image doivent avoir une miniature associée (voir la
-section suivante à propos des miniatures).</li>
-
-  <li>Les éléments de type image peuvent avoir un image en grand format
-associé. Comme pour le fichier <span class="filename">mariage.jpg</span>
-dans l'exemple ci-dessus. Aucun préfixe n'est nécessaire sur le nom du
-fichier.</li>
-
-  <li>Les éléments autres que les images (vidéos, sons, fichiers texte, tout ce que vous
+  <li>Les éléments autres que les photos (vidéos, sons, fichiers texte, tout ce que vous
 voulez...) sont représentés par défaut par une icône correspondant à
-l'extension du nom du fichier. Optionnellement, une miniature et un
-représentant peuvent être associés (voir le fichier <span
-class="filename">video.avi</span> dans l'exemple).</li>
+l'extension du nom du fichier. Optionnellement, un
+représentant peut être associé (voir le fichier <span
+class="filename">video-decollage-avion.avi</span> dans l'exemple).</li>
+
+  <li>Formats multiples : vous pouvez proposer une photo dans plusieurs formats. Dans cet exemple, il y a 3 formats supplémentaires pour img0001.jpg. Vous pouvez activer cette fonctionnalité en ajoutant <code>$conf['enable_formats'] = true;</code> à votre configuration locale et en définissant une liste de formats, comme <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
 
   <li><em>Attention</em> : le nom d'un répertoire ou d'un fichier ne doit
 être composé que de lettres, de chiffres, de "-", "_" ou ".". Pas d'espace
 ou de caractères accentués.</li>
 
-  <li><em>Conseil</em> : une catégorie peut contenir des éléments et des
-sous-catégories à la fois. Néanmoins, il est fortement conseillé pour chaque
-catégorie de choisir entre contenir des éléments <strong>ou bien</strong>
-des sous-catégories.</li>
+  <li><em>Conseil</em> : un album peut contenir des photos et des
+sous-album à la fois. Néanmoins, il est fortement conseillé pour chaque
+album de choisir entre contenir des photos <strong>ou bien</strong>
+des sous-album.</li>
 
-  <li>Une fois que les fichiers, les miniatures et les représentants sont
+  <li>Une fois que les fichiers sont
 correctement placés dans les répertoires, se rendre sur l'écran <span
-class="pwgScreen">Administration &raquo; Catégories &raquo; Synchroniser</span>.</li>
-
-</ul>
-
-</fieldset>
-
-<fieldset>
-  <legend>Miniatures</legend>
-
-<ul>
-  
-  <li>Comme mentionné précédemment, chaque élément de type image doit être
-associé à une miniature.</li>
-
-  <li>Les miniatures sont stockées dans le sous-répertoire "thumbnail" de
-chaque répertoire représentant une catégorie. Une miniature est un fichier
-de type image (même extension du nom du fichier) dont le nom de fichier est
-préfixé par le paramètre de configuration <code>prefix_thumbnail</code>
-(voir <span class="filename">include/config.inc.php</span>).</li>
-
-  <li>Les miniatures n'ont pas besoin d'avoir la même extension que leur
-image associée (une image avec ".jpg" comme extension peut avoir une
-miniature en ".GIF" par exemple).</li>
-
-  <li>Il est conseillé d'utiliser un outil externe pour la création des
-miniatures.</li>
-
-  <li>Vous pouvez également utiliser l'outil de création de miniatures
-intégré à Piwigo mais cela est déconseillé car la qualité risque
-d'être décevante et cela utilise inutilement les ressources du serveur (ce
-qui peut être un grave problème sur un serveur mutualisé).</li>
-
-  <li>Si vous choisissez d'utiliser le serveur web pour générer les
-miniatures, vous devez donner les droits en écriture sur les
-répertoires.</li>
+class="pwgScreen">Administration &raquo; Outils &raquo; Synchroniser</span>.</li>
 
 </ul>
 
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 20fc37a28..6c6fb81f0 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -807,8 +807,8 @@ $lang['Send connection settings by email'] = 'Envoyer les identifiants par email
 $lang['Activate comments'] = 'Activer les commentaires';
 $lang['Default comments order'] = 'Ordre par défaut des commentaires';
 $lang['A locked gallery is only visible to administrators'] = 'Une galerie verrouillée n\'est visible que des administrateurs';
-$lang['Unlock gallery'] = 'Déverouiller la galerie';
-$lang['Gallery unlocked'] = 'Galerie déverouillée';
+$lang['Unlock gallery'] = 'Déverrouiller la galerie';
+$lang['Gallery unlocked'] = 'Galerie déverrouillée';
 $lang['Notify administrators when a comment is'] = 'Notifier les administrateurs lorsqu\'un commentaire est';
 $lang['modified'] = 'modifié';
 $lang['deleted'] = 'supprimé';
diff --git a/language/fr_FR/help/photos_add_ftp.html b/language/fr_FR/help/photos_add_ftp.html
index 7ab8e192d..39b4fb3aa 100644
--- a/language/fr_FR/help/photos_add_ftp.html
+++ b/language/fr_FR/help/photos_add_ftp.html
@@ -39,15 +39,24 @@ galleries
 |       |-- discours002.jpg
 |       +-- discours003.jpg
 +-- voyage-de-noces
-    |-- hotel.png
-    |-- video-decollage-avion.avi
-    +-- pwg_representative
-        +-- video-decollage-avion.jpg
+|   |-- hotel.png
+|   |-- video-decollage-avion.avi
+|   +-- pwg_representative
+|       +-- video-decollage-avion.jpg
++-- seance-photographe
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
   
-  <li>A l'exception de celui appelé "pwg_representative", chaque répertoire dans "galleries" génère un album. Le nombre de niveaux (profondeur) n'est pas limité.</li>
+  <li>A l'exception de "pwg_representative" et "pwg_format", chaque répertoire dans "galleries" génère un album. Le nombre de niveaux (profondeur) n'est pas limité.</li>
 
   <li>Fondamentalement, une photo est représentée par un fichier. Pour Piwigo, un fichier peut être une photo si son extension figure dans la liste du paramètre de configuration <code>file_ext</code> (voir
 fichier <span class="filename">include/config.inc.php</span>). Un fichier
@@ -60,6 +69,8 @@ l'extension du nom du fichier. Optionnellement, un
 représentant peut être associé (voir le fichier <span
 class="filename">video-decollage-avion.avi</span> dans l'exemple).</li>
 
+  <li>Formats multiples : vous pouvez proposer une photo dans plusieurs formats. Dans cet exemple, il y a 3 formats supplémentaires pour img0001.jpg. Vous pouvez activer cette fonctionnalité en ajoutant <code>$conf['enable_formats'] = true;</code> à votre configuration locale et en définissant une liste de formats, comme <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Attention</em> : le nom d'un répertoire ou d'un fichier ne doit
 être composé que de lettres, de chiffres, de "-", "_" ou ".". Pas d'espace
 ou de caractères accentués.</li>
diff --git a/language/gl_ES/help/photos_add_ftp.html b/language/gl_ES/help/photos_add_ftp.html
index 0d1caf7df..046e119a1 100755
--- a/language/gl_ES/help/photos_add_ftp.html
+++ b/language/gl_ES/help/photos_add_ftp.html
@@ -37,21 +37,32 @@ galleries
 |       |-- dancers002.jpg
 |       +-- dancers003.jpg
 +-- honeymoon
-    |-- hotel.png
-    |-- video-from-plane.avi
-    +-- pwg_representative
-        +-- video-from-plane.jpg
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
 
-  <li>A excepción de "pwg_representative" (ver explicación debaixo), cada cartafol dentro de "galleries" produce un álbum. Non hai límite de profundidade.</li>
+  <li>A excepción de "pwg_representative" é "pwg_format (ver explicación debaixo), cada cartafol dentro de "galleries" produce un álbum. Non hai límite de profundidade.</li>
 
   <li>Basicamente, un elemento é representado por un ficheiro. Un ficheiro pode ser un elemento Piwigo se súa extensión está entre as posibles nos parámetros de configuración <code>file_ext</code> (ver o ficheiro <span
   class="filename">include/config_default.inc.php</span>). Un ficheiro pode ser unha imaxe se súa extensión está entre as posibles nos parámetros de configuración <code>picture_ext</code>.</li>
 
   <li>Os elementos que non son fotos (vídeo, sons, ficheiros de texto, calquera outro...) son representados de xeito predeterminado por unha icona correspondente á extensión do ficheiro. Opcionalmente, podes asociar unha miniatura e un ficheiro representativo (ver video.avi no exemplo de arriba).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Aviso</em>: o nome dos cartafoles e ficheiros debe conter só letras, números, "-", "_" ou ".". Sen espazos en branco nin caracteres acentuados.</li>
 
   <li>Unha vez que as imaxes estean correctamente situadas nos cartafoles, vai a: <span class="pwgScreen">Administración &raquo; Ferramentas &raquo; Sincronizar</span></li>
diff --git a/language/hu_HU/help/photos_add_ftp.html b/language/hu_HU/help/photos_add_ftp.html
index 96bd6d230..95d60edec 100644
--- a/language/hu_HU/help/photos_add_ftp.html
+++ b/language/hu_HU/help/photos_add_ftp.html
@@ -28,38 +28,33 @@ Gratulálunk, ezzel létrehoztad az első album képtárat.
     Itt következik a könyvtárfa egy kis galériáról, (de számos funkcióval): </p>
   
     <pre>
-.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- category-1
-|   |   |-- category-1.1
-|   |   |   |-- category-1.1.1
-|   |   |   |   |-- category-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- category-1.1.1.2
-|   |   |   +-- category-1.1.2
-|   |   |-- category-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- category-1.3
-|   +-- category-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool</pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
 
   </li>
   
@@ -80,6 +75,8 @@ Gratulálunk, ezzel létrehoztad az első album képtárat.
   alapértelmezés szerint a fájl kiterjesztéséhez illeszkedő ikon jelenik meg. 
   Az ilyen fájlokhoz hozzárendelhető egy bélyegkép fájl (lásd a fenti példában a video.avi fájlt).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Figyelem</em>: a könyvtárak és fájlok nevei csak betűket és számokat, 
   valamint a következő karaktereket tartalmazhatják: "-", "_" vagy ".". 
   Nem lehet üres hely és soremelés karakter.</li>
diff --git a/language/it_IT/help/photos_add_ftp.html b/language/it_IT/help/photos_add_ftp.html
index 8e5001fd6..3d2fb0ea8 100644
--- a/language/it_IT/help/photos_add_ftp.html
+++ b/language/it_IT/help/photos_add_ftp.html
@@ -43,11 +43,20 @@ galleries
     |-- video-decollo-aereo.avi
     +-- pwg_representative
         +-- video-decollo-aereo.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
   
-  <li>Ad eccezione di "pwg_representative", ogni directory inserita in "galleries" genera un album. Il numero di livelli (profondità) è illimitato.</li>
+  <li>Ad eccezione di "pwg_representative" and "pwg_format", ogni directory inserita in "galleries" genera un album. Il numero di livelli (profondità) è illimitato.</li>
 
   <li>Una foto è invece rappresentata da un file. Un file può essere una foto di Piwigo se la sua estensione è presente tra le possibilità previste nel parametro di configuarzione <code>file_ext</code> (vedi
 file <span class="filename">include/config.inc.php</span>). Un file è considerato come una foto
@@ -60,6 +69,8 @@ all'estensione del file. In modo opzionale, è possibile associare una miniatura
 ed un file rappresentativo (come per il file <span 
 class="filename">video-decollaggio-aereo.avi</span> nell'esempio proposto).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Attenzione</em>: il nome di una directory o di un file deve essere
 composto da lettere, numeri o simboli come "-", "_" o ".". Non utilizzate spazio
 e caratteri accentati.</li>
diff --git a/language/ja_JP/admin.lang.php b/language/ja_JP/admin.lang.php
index 4a0d084e3..6a95fc013 100644
--- a/language/ja_JP/admin.lang.php
+++ b/language/ja_JP/admin.lang.php
@@ -67,10 +67,10 @@ $lang['Database'] = 'データベース';
 $lang['Deactivate'] = '無効化';
 $lang['Delete Representant'] = 'アルバムのサムネイルを削除する';
 $lang['Delete selected tags'] = '選択したタグを削除する';
-$lang['Delete selected users'] = '選択したユーザを削除する';
+$lang['Delete selected users'] = '選択したユーザーを削除する';
 $lang['Deletions'] = '削除';
 $lang['Deny selected groups'] = '選択したグループを拒否する';
-$lang['Deny selected users'] = '選択したユーザを拒否する';
+$lang['Deny selected users'] = '選択したユーザーを拒否する';
 $lang['Description'] = '説明';
 $lang['Display options'] = '表示オプション';
 $lang['Dissociated'] = '関連なし';
@@ -157,14 +157,14 @@ $lang['Tag selection'] = 'タグ選択';
 $lang['The %d following tags were deleted'] = '次の %d 件のタグが削除されました。';
 $lang['Uninstall'] = 'アンインストール';
 $lang['Use the default photo sort order'] = 'デフォルトのイメージ並び順を使用する';
-$lang['User comments validation'] = 'ユーザコメント承認';
-$lang['Users'] = 'ユーザ';
+$lang['User comments validation'] = 'ユーザーコメント承認';
+$lang['Users'] = 'ユーザー';
 $lang['Validate'] = '承認';
 $lang['Validation'] = '承認';
 $lang['Version'] = 'バージョン';
 $lang['Virtual albums to move'] = '移動するバーチャルアルバム';
 $lang['Virtual album name'] = 'バーチャルアルバム名';
-$lang['Webmaster cannot be deleted'] = 'ウェブマスタは削除できません。';
+$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 an album in its own sub album'] = 'あなたは、アルバムをサブアルバムに移動できません。';
@@ -219,9 +219,9 @@ $lang['Execution time is out, treatment must be continue [Estimated time: %d sec
 $lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = '実行時間が終了しました。処理を継続します  [予想時間: %d 秒].';
 $lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'メール送信するユーザリストのユーザ数が制限されています。他のユーザは、リストに含まれていません。';
 $lang['Time to send mail is limited. Others mails are skipped.'] = 'メール送信時間が制限されています。他のメールはスキップされます。';
-$lang['To send ?'] = '送信?';
+$lang['To send ?'] = '送信しますか?';
 $lang['Last send'] = '最終送信';
-$lang['User'] = 'ユーザ';
+$lang['User'] = 'ユーザー';
 $lang['See you soon,'] = 'それでは ';
 $lang['Go to'] = '移動 ';
 $lang['Hello'] = 'こんにちは ';
@@ -267,23 +267,23 @@ $lang['Subscribe'] = '購読';
 $lang['Parameters'] = 'パラメータ';
 $lang['Select recipients'] = '受信者の選択';
 $lang['Subscribe/unsubscribe users'] = 'ユーザの購読登録/購読解除';
-$lang['Unsubscribed'] = '購読なし';
+$lang['Unsubscribed'] = '購読解除';
 $lang['%d parameter was updated.'] = '%d 件のパラメータが更新されました。';
 $lang['%d parameters were updated.'] = '%d 件のパラメータが更新されました。';
 $lang['%d user was not updated.'] = '%d 名のユーザが更新されませんでした。';
 $lang['%d users were not updated.'] = '%d 名のユーザが更新されませんでした。';
-$lang['User %s [%s] was removed from the subscription list.'] = 'ユーザ %s [%s] は、購読リストから削除されました。';
-$lang['User %s [%s] was added to the subscription list.'] = 'ユーザ %s [%s] は、購読リストに追加されました。';
+$lang['User %s [%s] was removed from the subscription list.'] = 'ユーザー %s [%s] は、購読リストから削除されました。';
+$lang['User %s [%s] was added to the subscription list.'] = 'ユーザー %s [%s] は、購読リストに追加されました。';
 $lang['%d user was updated.'] = '%d 名のユーザが更新されました。';
 $lang['%d users were updated.'] = '%d 名のユーザが更新されました。';
-$lang['User %s [%s] was not removed from the subscription list.'] = 'ユーザ %s [%s] は、購読リストから削除されませんでした。';
-$lang['User %s [%s] was not added to the subscription list.'] = 'ユーザ %s [%s] は、購読リストに追加されませんでした。';
-$lang['User %s [%s] added.'] = 'ユーザ %s [%s] が追加されました。';
-$lang['Warning: subscribing or unsubscribing will send mails to users'] = '注意: 購読登録または購読解除の設定は、ユーザ宛にメール通知されます。';
-$lang['Send mail on HTML format'] = 'HTMLフォーマットでメールを送信する';
+$lang['User %s [%s] was not removed from the subscription list.'] = 'ユーザー %s [%s] は、購読リストから削除されませんでした。';
+$lang['User %s [%s] was not added to the subscription list.'] = 'ユーザー %s [%s] は、購読リストに追加されませんでした。';
+$lang['User %s [%s] added.'] = 'ユーザー %s [%s] が追加されました。';
+$lang['Warning: subscribing or unsubscribing will send mails to users'] = '注意: 購読登録または購読解除の設定は、ユーザー宛にメール通知されます。';
+$lang['Send mail on HTML format'] = 'HTML形式でメールを送信する';
 $lang['Include display of recent photos grouped by dates'] = '最近の写真グループの日付ごとの表示を含む';
 $lang['Available only with HTML format'] = 'HTMLフォーマットのみ利用可';
-$lang['no write access'] = 'アクセス権なし';
+$lang['no write access'] = '書き込み権限なし';
 $lang['Permissions'] = 'パーミッション';
 $lang['private'] = 'プライベート';
 $lang['public'] = 'パブリック';
@@ -320,7 +320,7 @@ $lang['Album list management'] = 'アルバム管理';
 $lang['Piwigo configuration'] = 'Piwigo設定';
 $lang['Edit album'] = 'アルバムを編集する';
 $lang['Group management'] = 'グループ管理';
-$lang['User list'] = 'ユーザリスト';
+$lang['User list'] = 'ユーザーリスト';
 $lang['Database synchronization with files'] = 'ファイルおよびデータベースの同期化';
 $lang['all'] = 'すべて';
 $lang['height must be a number superior to'] = '高さは、次の値より大きくしてください:';
@@ -361,7 +361,7 @@ $lang['Metadata synchronization results'] = 'メタデータ同期結果';
 $lang['only perform a simulation (no change in database will be made)'] = 'シミュレーションのみ実行する (データベースは更新されません)';
 $lang['Simulation'] = 'シミュレーション';
 $lang['directories + files'] = 'ディレクトリ + ファイル';
-$lang['only directories'] = 'ディレクトリのみ';
+$lang['only directories'] = 'ディレクトリーのみ';
 $lang['synchronize files structure with database'] = 'ファイル構造とデータベースを同期化する';
 $lang['synchronize files metadata with database photos informations'] = 'ファイルメタデータとデータベースエレメント情報を同期化する';
 $lang['even already synchronized photos'] = 'すでに同期化されているエレメントも同期化する';
@@ -370,7 +370,7 @@ $lang['The name of directories and files must be composed of letters, numbers, "
 $lang['wrong filename'] = 'ファイル名が正しくありません。';
 $lang['Upload'] = 'アップロード';
 $lang['user "%s" added'] = 'ユーザ "%s" が追加されました。';
-$lang['User status'] = 'ユーザステータス';
+$lang['User status'] = 'ユーザーステータス';
 $lang['user_status_admin'] = '管理者';
 $lang['user_status_generic'] = '一般';
 $lang['user_status_guest'] = 'ゲスト';
@@ -384,7 +384,7 @@ $lang['Advanced features'] = '高度な機能';
 $lang['Overall'] = '全体';
 $lang['Year'] = '年';
 $lang['Month'] = '月';
-$lang['Day'] = '日';
+$lang['Day'] = '曜日';
 $lang['Pages seen'] = 'ページ閲覧回数';
 $lang['Time'] = '時間';
 $lang['IP'] = 'IP';
@@ -438,7 +438,7 @@ $lang['Main "guest" user status is incorrect'] = 'メイン「ゲスト」ユー
 $lang['Default user does not exist'] = 'デフォルトユーザーが設定されていません。';
 $lang['Main "webmaster" user does not exist'] = 'メイン「ウェブマスタ」ユーザーは存在しません。';
 $lang['Main "webmaster" user status is incorrect'] = 'メイン「ウェブマスタ」ユーザーステータスが正しくありません。';
-$lang['User "%s" created with "%s" like password'] = 'ユーザ「 %s 」がパスワード「 %s 」で作成されました。';
+$lang['User "%s" created with "%s" like password'] = 'ユーザー「 %s 」がパスワード「 %s 」で作成されました。';
 $lang['Status of user "%s" updated'] = 'ユーザ "%s" のステータスが更新されました。';
 $lang['add new photos to caddie'] = 'キャディに新しいエレメントを追加する';
 $lang['No display'] = '表示なし';
@@ -475,7 +475,7 @@ $lang['Can\'t create temporary file.'] = '一時ファイルを作成できま�
 $lang['Can\'t download archive.'] = 'アーカイブをダウンロードできません。';
 $lang['Can\'t read or extract archive.'] = 'アーカイブを読めないか、展開できません。';
 $lang['An error occured during extraction (%s).'] = '展開中にエラーが発生しました (%s)。';
-$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = '「プラグイン」フォルダおよびサブフォルダのパーミッションをチェック (CHMOD) してください。';
+$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = '「プラグイン」フォルダおよびサブフォルダのパーミッションをチェックしてください(CHMOD)。';
 $lang['Can\'t connect to server.'] = 'サーバに接続できません。';
 $lang['Purge compiled templates'] = 'コンパイル済みテンプレートを削除する';
 $lang['ACCESS_0'] = 'フリーアクセス';
@@ -529,7 +529,7 @@ $lang['Number of downloads'] = 'ダウンロードの件数';
 $lang['Piwigo Announcements Newsletter'] = 'Piwigo のニューズレター';
 $lang['Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.'] = 'Piwigoプロジェットのニュースレターでは、Piwigoの新しいリリース情報やセキュリティ・バグ修正、アップグレードなどについてのお知らせいたします。Piwigoのニュースレターに加入して下さい。';
 $lang['Subscribe %s'] = '加入 %s';
-$lang['Subscribe %s to Piwigo Announcements Newsletter'] = ' %s Piwigoのニューズレターを加入する';
+$lang['Subscribe %s to Piwigo Announcements Newsletter'] = ' %s Piwigoのニューズレターを購読する';
 $lang['Purge search history'] = 'パージ検索履歴';
 $lang['Hide'] = '隠す';
 $lang['Password is missing. Please enter the password.'] = 'パスワードがありません。パスワードを入力して下さい。';
@@ -547,12 +547,12 @@ $lang['Instructions to use Piwigo'] = 'Piwigoの使い方';
 $lang['Installed Themes'] = 'インストールされたテーマ';
 $lang['Add New Theme'] = '新しいテーマを追加する';
 $lang['Forbid this theme to users'] = 'このテーマをユーザーに禁止する';
-$lang['Set as default theme for unregistered and new users'] = '新しいユーザーや登録されてないユーザーにデフォルト・テーマを設定する';
+$lang['Set as default theme for unregistered and new users'] = '新しいユーザーや登録されてないユーザーにデフォルトのテーマを設定する';
 $lang['unknown'] = '不明';
 $lang['Upload Photos'] = '写真をアップロードする';
 $lang['Drop into album'] = 'アルバムに入れる';
 $lang['+ Add an upload box'] = '+ アップロード・ボックスを追加する';
-$lang['Create the "%s" directory at the root of your Piwigo installation'] = ' Piwigoにインストールされている場所の"%s" というディレクトリーに作成してください。';
+$lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Piwigoのインストールされている場所の"%s" というディレクトリーに作成してください。';
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Piwigoにインストールされている場所の "%s" というディレクトリーに書き込み(chmod 777)アクセスをする。';
 $lang['existing album'] = '存在しているアルバム';
 $lang['create a new album'] = '新しいアルバムを作成する';
@@ -616,10 +616,10 @@ $lang['Select:'] = '選択:';
 $lang['None'] = 'なし';
 $lang['Invert'] = '反転';
 $lang['Impossible to deactivate this theme, you need at least one theme.'] = 'このテーマは無効になりません。少なくとも一つのテーマが必要です。';
-$lang['Webmaster status is required.'] = 'ウェッブマスターのステータスが必要';
-$lang['Bound Theme'] = 'バウンドテーマ';
+$lang['Webmaster status is required.'] = 'ウェブマスターのステータスが必要';
+$lang['Bound Theme'] = 'テーマを割り当てる';
 $lang['Allow rating'] = 'レーティングを許可する';
-$lang['Select at least one comment'] = '少なくとも一つのコメントを選択して下さい';
+$lang['Select at least one comment'] = '少なくとも1つのコメントを選択して下さい';
 $lang['Active Plugins'] = '有効なプラグイン';
 $lang['Inactive Plugins'] = '無効なプラグイン';
 $lang['Missing Plugins'] = '見つからないプラグイン';
@@ -659,7 +659,7 @@ $lang['Choose an action'] = 'アクションを選択して下さい';
 $lang['Activate icon "new" next to albums and pictures'] = 'アルバムと写真のとなりに、\'起動アイコン　"新" があります';
 $lang['Deactivate all'] = '全て非活性する';
 $lang['Default photos order'] = 'デフォルト写真順番';
-$lang['Delete orphan tags'] = '使われていないタグを削除する';
+$lang['Delete orphan tags'] = '使われていないタグを削除します';
 $lang['delete photo'] = '写真を削除する';
 $lang['Duplicates'] = '重複';
 $lang['Error on file "%s" : %s'] = '"%s"　のファイル・エラー : %s';
@@ -679,7 +679,7 @@ $lang['Include history data (Warning: server memory limit may be exceeded)'] = '
 $lang['Unable to dump database.'] = 'ダンプデータベースができません。';
 $lang['Update in progress... Please wait.'] = 'アップグレード処理中 ... お待ちください。';
 $lang['Update to Piwigo %s'] = 'Piwigo %s にアップグレード';
-$lang['Two updates are available'] = '２個のアップグレードがあります';
+$lang['Two updates are available'] = '2個のアップグレードがあります';
 $lang['This is a minor update, with only bug corrections.'] = 'これはマイナーアップグレードだけバグ修正しています。';
 $lang['This is a major update, with <a href="%s">new exciting features</a>.'] = 'これはメジャーアップグレードで、 いろいろな楽しい<a href="%s">新機能がついています。</a>.';
 $lang['Some themes and plugins may be not available yet.'] = 'あるテーマとプラグインはまだできていません。';
@@ -718,7 +718,7 @@ $lang['Permission management'] = '権限管理';
 $lang['Remove all filters'] = '全てのフィルターを削除';
 $lang['Remove from caddie'] = 'キャディーから削除';
 $lang['Restore'] = '復元';
-$lang['Set author'] = '作者をセット';
+$lang['Set author'] = '作者を設定';
 $lang['Some upgrades are available for extensions.'] = '拡張機能のアップグレードがあります。';
 $lang['Type here the author name'] = '作者名を入力してください。';
 $lang['Update All'] = '全てをアップデート';
@@ -762,8 +762,8 @@ $lang['top left corner'] = '左上';
 $lang['top right corner'] = '右上';
 $lang['%s photos can not be regenerated'] = '%s 更新できなかった写真。';
 $lang['%s photos have been regenerated'] = '%s 更新できた写真。';
-$lang['Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'] = 'おおよその最大レゾリューション：%dM ピクセル (%dx%d ピクセルである).';
-$lang['By default, Piwigo will create a new websize from the HD (high definition) version of your photo.'] = 'デフォルトで、PiwigoがHD（高品位）版の写真より、最新ウェブサイズ版を作成します。';
+$lang['Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'] = 'おおよその最大解像度：%dM ピクセル (%dx%d ピクセルである).';
+$lang['By default, Piwigo will create a new websize from the HD (high definition) version of your photo.'] = 'デフォルトで、PiwigoはHD(高品質)版の写真から新しくウェブサイズ版を生成します。';
 $lang['Do you want to activate anyway?'] = 'とにかく有効化したいですか？';
 $lang['ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW.'] = 'エラー：このプラグインがありませんが、インストールされています！すぐアンインストールして下さい。';
 $lang['Follow Orientation'] = '配向進み';
@@ -809,15 +809,15 @@ $lang['Multiple Size'] = '複数のサイズ';
 $lang['Piwigo Publish plugin for Lightroom'] = 'Lightroom 用 Piwigo エクスポートプラグイン';
 $lang['Piwigo export plugin for Aperture'] = 'Aperture 用 Piwigo エクスポートプラグイン';
 $lang['Piwigo export plugin for iPhoto'] = 'iPhoto 用 Piwigo エクスポートプラグイン';
-$lang['Piwigo for Android'] = 'Piwigo for Android';
-$lang['Piwigo for iOS (iPhone, iPad, iPod Touch)'] = 'Piwigo for iOS (iPhone, iPad, iPod Touch)';
+$lang['Piwigo for Android'] = 'Android用Piwigo';
+$lang['Piwigo for iOS (iPhone, iPad, iPod Touch)'] = 'iOS用Piwigo(iPhone, iPad, iPod Touch)';
 $lang['Piwigo publish plugin for Shotwell'] = 'Shotwell 用 Piwigo 公開プラグイン';
 $lang['Piwigo publish plugin for digiKam'] = 'digiKam 用 Piwigo 公開プラグイン';
 $lang['Predefined filter'] = '定義済みフィルター';
 $lang['Select groups...'] = 'グループを選択...';
 $lang['Select users...'] = 'ユーザーを選択...';
-$lang['Set creation date'] = 'コレクション日を設定';
-$lang['Sharpen'] = 'シャープ';
+$lang['Set creation date'] = '作成日を設定';
+$lang['Sharpen'] = 'シャープにする';
 $lang['The whole page'] = 'ページ全体';
 $lang['The whole set'] = 'セット全体';
 $lang['This album contains no photo.'] = 'このアルバムには写真がありません。';
@@ -834,13 +834,13 @@ $lang['Generate multiple size images'] = '複数サイズのイメージを作�
 $lang['Original file : %s'] = 'オリジナルファイル : %s';
 $lang['Added by %s'] = '%sで追加されました。';
 $lang['Automatic sort order'] = '自動並び替え';
-$lang['By default, the center of interest is placed in the middle of the photo.'] = '写真の真ん中は中心デフォルト';
+$lang['By default, the center of interest is placed in the middle of the photo.'] = 'デフォルトで、関心の中心は写真の中央に合わせます';
 $lang['Center of interest'] = '中心';
 $lang['No destination tag selected'] = '行き先タグ選択されていません';
 $lang['No group is permitted to see this private album'] = 'このプライベートなアルバムを見ることのできるグループはありません';
 $lang['No photo in the current set.'] = '現在のセットには写真がありません。';
 $lang['No photo selected, %d photos in current set'] = '写真が選択されません。現在のセットに%d枚写真があります。';
-$lang['Orphan tags deleted'] = 'オーファンタグ削除されました。';
+$lang['Orphan tags deleted'] = '使われていないタグが削除されました';
 $lang['Photos generation in progress...'] = '写真作成中・・・';
 $lang['Posted %s on %s'] = '%sの%s展示されました。';
 $lang['Save manual order'] = 'マニュアル順保存します。';
@@ -850,12 +850,12 @@ $lang['The uploaded file was only partially uploaded'] = 'アップロードさ�
 $lang['There is no group in this gallery.'] = 'このガラリにグループがありません。';
 $lang['Type in a search term'] = '検索アイテムを入力してください。';
 $lang['Visited %d times'] = '%d回見られました。';
-$lang['WARNING! This plugin does not seem to be compatible with this version of Piwigo.'] = '注意！このプラグインがこのPIWIGOのバージョンに合っていません。';
+$lang['WARNING! This plugin does not seem to be compatible with this version of Piwigo.'] = '注意！このプラグインはPiwigoのバージョンに合っていません。';
 $lang['Who can see this photo?'] = 'どなたがこの写真を見られますか？';
 $lang['With no album'] = 'アルバムなしを含まれます。';
 $lang['With no tag'] = 'タグなしを含まれます。';
 $lang['With no virtual album'] = 'バーチャル・アルバムが含まれません。';
-$lang['You can activate only one mobile theme.'] = 'モバイル・テーマ一つしか有効できません。';
+$lang['You can activate only one mobile theme.'] = 'モバイル・テーマは1つしか有効化できません。';
 $lang['cancel manual order'] = 'マニュアル順を中止します。';
 $lang['registered users'] = '登録されているユーザー';
 $lang['simple visitors'] = '単ユーザー';
@@ -882,7 +882,7 @@ $lang['Duplicate'] = '重複';
 $lang['Duplicate selected tags'] = '選択したタグを複製します';
 $lang['Apply watermark if height is bigger than'] = 'これ以上の高さの際にウォーターマークを付ける';
 $lang['Apply watermark if width is bigger than'] = 'これ以上の幅の際にウォーターマークを付ける';
-$lang['Adobe Photoshop Lightroom is a photography software designed to manage large quantities of digital images and doing post production work.'] = 'Adobe Photoshop Lightroomは、大量のデジタル画像の管理と、撮影後の仕事のために設計されて写真用ソフトウェアです。';
+$lang['Adobe Photoshop Lightroom is a photography software designed to manage large quantities of digital images and doing post production work.'] = 'Adobe Photoshop Lightroomは、大量のデジタル画像の管理と、撮影後の仕事のために設計された写真用ソフトウェアです。';
 $lang['Permission granted for groups'] = 'グループ権限';
 $lang['Panorama'] = 'パノラマ';
 $lang['Number of albums per page'] = '１ページ当りのアルバム数';
@@ -900,7 +900,7 @@ $lang['Loading...'] = 'ロード中 ...';
 $lang['Change password'] = 'パスワードを変える';
 $lang['Change username'] = 'ユーザー名を変える';
 $lang['Tag "%s" is now a duplicate of "%s"'] = 'タグ "%s"は、現在 "%s"と重複しています';
-$lang['Allow users to add a link to their website'] = 'ユーザは自分のウェブサイトへのリンクを追加できるようにする';
+$lang['Allow users to add a link to their website'] = 'ユーザーは自分のウェブサイトへのリンクを追加できるようにする';
 $lang['All %d users are selected'] = '全ての %d ユーザが選択されました';
 $lang['<em>Piwigo for iOS</em> application empowers you to connect to your Piwigo gallery from your iPhone, iPad or iPod Touch, create some albums and upload several photos at once.'] = '<em>Piwigo for iOS</em>アプリは、iPhone、iPad、iPod Touchから、Piwigoギャラリーに接続し、アルバムを作成したり、複数の写真を一括でアップロードしたりできます。';
 $lang['Activate it now'] = '今すぐ有効にする';
@@ -917,13 +917,13 @@ $lang['date & time'] = '日付と時刻';
 $lang['No matching user found'] = '一致するユーザはみつかりませんでした';
 $lang['ReGalAndroid (RemoteGallery client for Android) is an open source (GPL v3) Piwigo client for the Android platform.'] = 'ReGalAndroid (RemoteGallery client for Android)は、Android 携帯/タブレット向けのオープンソース(GPL v3)クライアントソフトです';
 $lang['Rename'] = 'リネーム';
-$lang['Select at least one tag'] = '最低１つのタグを選択してください';
+$lang['Select at least one tag'] = '最低1つのタグを選択してください';
 $lang['width & height'] = '幅と高さ';
 $lang['close'] = '閉じる';
-$lang['User %s added'] = 'ユーザ %s を追加しました';
-$lang['User %s updated'] = 'ユーザ %s を更新しました';
-$lang['Users modified'] = 'ユーザの変更';
-$lang['Update user'] = 'ユーザの更新';
+$lang['User %s added'] = 'ユーザー %s を追加しました';
+$lang['User %s updated'] = 'ユーザー %s を更新しました';
+$lang['Users modified'] = 'ユーザーの変更';
+$lang['Update user'] = 'ユーザーの更新';
 $lang['Upload in progress'] = 'アップロード状況';
 $lang['Refresh photo set'] = 'フォトセットをリフレッシュ';
 $lang['Password updated'] = 'パスワードを更新しました';
@@ -938,6 +938,58 @@ $lang['Tags <em>%s</em> merged into tag <em>%s</em>'] = 'タグ　<em>%s</em>は
 $lang['digiKam is designed for photographers who want to view, manage, edit, enhance, organize, tag, and share photographs.'] = 'digiKamは、写真を見たり、管理、編集したり、シェアしたりしたい人向けのソフトです。';
 $lang['digiKam is an advanced digital photo management free software for Linux, Windows, and MacOSX.'] = 'digiKam は、洗練された写真管理ソフト（フリーソフト）です。Linux, Windows, Mac OS Xで動作します。';
 $lang['Shotwell is an open source digital photo organizer that runs on Linux. It is the default photo manager in Ubuntu and Fedora.'] = 'Shotwellは、Linux上で動作するオープンソースな写真管理ソフトです。UbuntuやFedoraではデフォルトになっています。';
-$lang['Select at least two tags for merging'] = 'マージするタグを２つ以上選択して下さい';
+$lang['Select at least two tags for merging'] = 'マージするタグを2つ以上選択して下さい';
 $lang['Select a zone with your mouse to define a new center of interest.'] = 'マウスを使って、必要な領域を選択して下さい';
 $lang['include photos with lower privacy level'] = 'プライバシーレベルの低い写真が、含まれています';
+$lang['The uploaded file exceeds the upload_max_filesize directive in php.ini: %sB'] = 'アップロードされたファイルは、php.iniに定められたupload_max_sizeを超過しています: %sB';
+$lang['The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'] = 'アップロードされたファイルは、HTMLフォームで指定されたMAX_FILE_SIZEディレクティブを超過しています';
+$lang['The settings for the guest are from the %s user'] = 'ゲストの設定は、%sユーザーから設定されています';
+$lang['The picture dimensions will be reduced to %dx%d pixels.'] = '写真は、%dx%dピクセルに縮小されます';
+$lang['The original maximum width must be a number between %d and %d'] = '元の最大の幅は、%dから%dの間の数で指定しなくてはいけません';
+$lang['The original maximum height must be a number between %d and %d'] = '元の最大の高さは、%dから%dの間の数で指定しなくてはいけません';
+$lang['The original image quality must be a number between %d and %d'] = '元の写真の品質は、%dから%dの間の数で指定しなくてはいけません';
+$lang['on the %d selected users'] = '%d人の選択されたユーザー';
+$lang['on the %d selected photos'] = '%d枚の選択された写真';
+$lang['iPhoto is the default photo manager on MacOSX. The Piwigo export plugin let you create new albums and export your photos directly from iPhoto to your Piwigo photo gallery.'] = 'iPhotoはMac OS Xのデフォルトの写真管理ソフトウェアです。Piwigoエクスポートプラグインにより、新しいアルバムを作成し、iPhotoからPiwigoギャラリーに直接エクスポートすることができます';
+$lang['between %s and %s MB'] = '%sから%s MBの間で';
+$lang['based on'] = '元';
+$lang['You have specified <i>$conf[\'order_by\']</i> in your local configuration file, this parameter in deprecated, please remove it or rename it into <i>$conf[\'order_by_custom\']</i> !'] = 'ローカルの設定ファイルで<i>$conf[\'order_by\']</i>が指定されています。このパラメーターは古く推奨されません。削除するか、<i>$conf[\'order_by_custom\']</i>に置き換えてください!';
+$lang['You can\'t define a default photo order because you have a custom setting in your local configuration.'] = 'ローカルの設定により、デフォルトの写真の順序を設定できません';
+$lang['Y Repeat'] = 'Y リピート';
+$lang['Type here the name of the new group'] = '新しいグループ名を入力してください';
+$lang['To export your photos from digiKam to Piwigo, simply install digiKam and the Kipi-plugins.'] = 'digikamkからPiwigoに写真をアップロードするには、digikamとKipiプラグインをインストールしてください';
+$lang['This group will be unset to default'] = 'このグループはデフォルトでは使われなくなります';
+$lang['This group will be set to default'] = 'デフォルトでこのグループが使われます';
+$lang['This album contains %d photos, added on %s.'] = 'このアルバムは%d個の写真を含んでいます。%sに追加しました';
+$lang['This album contains %d photos, added between %s and %s.'] = 'このアルバムは%d個の写真を含んでいます。%sと%sの間に追加しました';
+$lang['The uploaded files exceed the post_max_size directive in php.ini: %sB'] = 'アップロードされたファイルは、php.iniに定められたpost_max_sizeを超過しています: %sB';
+$lang['The center of interest is the most meaningful zone in the photo.'] = '関心の中心は、写真で最も重要な意味を持つ領域です';
+$lang['The Piwigo publish Plug-in allows you to export and synchronize photos from Lightroom directly to your Piwigo photo gallery.'] = 'LightroomのPiwigo公開プラグインにより、Piwigoのギャラリーを直接エクスポートし同期させることができます';
+$lang['The Piwigo export plugin allows you to create albums and export photos.'] = 'Piwigoエクスポートプラグインにより、アルバムを作成しエクスポートすることができます';
+$lang['Source tag'] = 'ソースタグ';
+$lang['Showing %s to %s of %s users'] = '%sから%sのユーザーを表示する(全%sユーザー)';
+$lang['Show %s users'] = '%sのユーザーを表示する';
+$lang['Save visits in history for'] = '訪問の履歴を保存する';
+$lang['Restore default configuration. You will lose your plugin settings!'] = 'デフォルトの設定を復元します。プラグインに関する設定は失われます';
+$lang['Resize after upload disabled due to the use of GD as graphic library'] = 'GDを画像ライブラリーとして使用しているためアップロードして拡大縮小する機能は無効化されています';
+$lang['Reset ignored updates'] = '無視したアップデートをリセットする';
+$lang['Registered on %s, %s.'] = '登録日: %s, %s';
+$lang['Rated %d times, score : %.2f'] = '%d回評価され、評価は%.2fです';
+$lang['Recipients'] = '受信者';
+$lang['No recipient selected'] = '受信者が選ばれていません';
+$lang['No user is permitted to see this private album'] = 'このプライベートアルバムを見ることのできるユーザーはいません';
+$lang['No user selected of %d users'] = '%dのユーザーのからユーザーが選ばれていません';
+$lang['No user selected, no action possible.'] = 'ユーザーが選択されていないので、操作できません';
+$lang['On your Linux, simply install Shotwell with your package manager and the activate Piwigo publishing option.'] = 'Linuxでは、Shotwellをパッケージ管理ソフトウェアからインストールすることで、Piwigoに公開するオプションを使うことができます';
+$lang['No and unlock sub-albums'] = 'いいえ。サブアルバムのロックを解除します';
+$lang['Last visit on %s, %s.'] = '最新の訪問日: %s, %s';
+$lang['Impossible to deactivate the default theme.'] = 'デフォルトのテーマを無効化することはできません';
+$lang['If no HD is available and if the current websize is bigger than resize dimensions, Piwigo will move it as HD and create a downsized websize photo from it.'] = 'HD版がない、または、現在のウェブサイズ版がサイズ変更後より大きい場合、Piwigoは、それをHD版とし、それから縮小したウェブサイズ版を作成します';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'セキュリティー上の理由により、管理者は認証キーを使うことはできません';
+$lang['Edit user'] = 'ユーザーを編集する';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = '電子メールは自動認証キーのリンクがあります。%sに対して有効です';
+$lang['Delete %d orphan photos'] = '%dの迷子の写真を削除します';
+$lang['Orphans'] = '迷子';
+$lang['You have %d orphan tags: %s.'] = '%d個の使われていないタグがあります: %s';
+$lang['Aperture is designed for professional photographers with iPhoto simplicity.'] = 'Apartureは、iPhotoのシンプルさを持ったプロの写真家用に設計されたソフトウェアです。';
+$lang['Aperture is a powerful tool to refine images and manage massive libraries on Mac.'] = 'Apartureは、Mac上で写真を調整し、大規模なライブラリーを管理するための強力なツールです。';
\ No newline at end of file
diff --git a/language/ja_JP/help/photos_add_ftp.html b/language/ja_JP/help/photos_add_ftp.html
index 23956ede2..21336b41d 100644
--- a/language/ja_JP/help/photos_add_ftp.html
+++ b/language/ja_JP/help/photos_add_ftp.html
@@ -26,38 +26,35 @@
 
     <p>ギャラリーディレクトリは、Piwigoディレクトリ「galleries」にあります。以下、非常に小さな (しかし、多くの特長を持つ) ギャラリーのディレクトリツリーの例です:</p>
 
-    <pre>.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- album-1
-|   |   |-- album-1.1
-|   |   |   |-- album-1.1.1
-|   |   |   |   |-- album-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- album-1.1.1.2
-|   |   |   +-- album-1.1.2
-|   |   |-- album-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- album-1.3
-|   +-- album-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool</pre>
+
+    <pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
 
   </li>
 
@@ -73,6 +70,8 @@
   <li>デフォルトでは、写真エレメント (ビデオ、サウンド、テキスト等) に関して、ファイル名の拡張子に関連付けられるアイコンはありません。
   任意で、あなたはサムネイルおよび見本ファイルを関連付けることができます (上記例のvideo.aviをご覧ください)。</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>警告</em>: ディレクトリおよびファイル名には、文字、「-」「_」「.」の記号のみ含んでください。空白、アクセント符号は含まないでください。</li>
 
   <li>ファイル、サムネイルおよび見本が正しくディレクトリに配置された場合、「<span class="pwgScreen">管理 > アルバム > 同期化</span>」に移動してください。</li>
diff --git a/language/ka_GE/help/photos_add_ftp.html b/language/ka_GE/help/photos_add_ftp.html
index b05abcefb..c5faf4f46 100644
--- a/language/ka_GE/help/photos_add_ftp.html
+++ b/language/ka_GE/help/photos_add_ftp.html
@@ -33,39 +33,35 @@
     <p>კატეგორიის ფოლდერები განლაგებულია ფოლდერ "galleries" -ში.
     ქვევით ნახეთ პატარა გალერეის წყობა:</p>
 
+
     <pre>
-.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- category-1
-|   |   |-- category-1.1
-|   |   |   |-- category-1.1.1
-|   |   |   |   |-- category-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- category-1.1.1.2
-|   |   |   +-- category-1.1.2
-|   |   |-- category-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- category-1.3
-|   +-- category-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool</pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
 
   </li>
 
@@ -80,6 +76,8 @@
 
   <li>ელემენტები, რომლებიც არ არიან ფოტოები (ვიდეო, მუსიკა, ტექსტი და ა.შ.) წარმოდგენილი არიან ამ ფაილის შესაბამისი მინიატურებით. დამატებით, თქვენ შეგიძლიათ დაუკავშიროთ მინიატურა და წარმომადგენლობითი ფაილი (ნახე video.avi მაგალითში მაღლა).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>ყურადღება</em>: ფოლდერების და ფაილების სახელი უნდა შედგებოდეს ასოების, რიცხვების, "-", "_" ან "." -საგან. ნუ გამოიყენებთ დაშორებებს.</li>
 
   <li><em>ცნობისათვის</em>: კატეგორია შეიძლება შეიცავდეს ელემენტებს და ქვეკატეგორიებს ერთდოულად. მიუხედავად ამისა, რეკომენდირებულია ყოველი კატეგორიისათვის აირჩიოთ, შეიცავს იგი ელემენტებს თუ კატეგორიებს.</li>
diff --git a/language/lv_LV/help/photos_add_ftp.html b/language/lv_LV/help/photos_add_ftp.html
index 3f380dfd7..76ccd4c3c 100644
--- a/language/lv_LV/help/photos_add_ftp.html
+++ b/language/lv_LV/help/photos_add_ftp.html
@@ -25,43 +25,39 @@
 
 <p>Kategoriju mapes atrodas Piwigo mapē "galleries". Tālāk seko ļoti mazas (bet ar ļoti daudz iespējām) galerijas mapju koks:</ p>
 
+
     <pre>
-.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- category-1
-|   |   |-- category-1.1
-|   |   |   |-- category-1.1.1
-|   |   |   |   |-- category-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- category-1.1.1.2
-|   |   |   +-- category-1.1.2
-|   |   |-- category-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- category-1.3
-|   +-- category-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool</pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
 
 </li>
 
-<li>Izņemot ar nosaukumu "thumbnail", "pwg_high" vai "pwg_representative" (skatīt skaidrojumu zemāk), katra mape zem "galleries" veido kategoriju. To dziļumam nav ierobežojumu.</li>
+<li>Izņemot ar nosaukumu "pwg_representative" vai "pwg_format (skatīt skaidrojumu zemāk), katra mape zem "galleries" veido kategoriju. To dziļumam nav ierobežojumu.</li>
 
 <li>Pamatā elementu pārstāv fails. Fails var būt Piwigo elements, ja tā paplašinājums ir starp <code>file_ext</code> konfigurācijas parametru iespējām (skatīt <span class="filename">include/config_default.inc.php</span> failu). Fails var būt attēls, ja tā paplašinājums ir starp <code>picture_ext</code> konfigurācijas parametru iespējām.</li>
 
@@ -71,6 +67,8 @@
 
 <li>Pēc noklusējuma ikonai, kas pārstāv faila nosaukuma paplašinājumu, nav nekādu papildus attēla elementu (video, skaņu, tekstu, jebkas...) . Ar papildus izvēli, Jūs varat sasaistīt sīkbildi un pārstāvošo failu (skatīt video.avi augstāk piemērā).</li>
 
+<li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
 <li><em>Brīdinājums</em>: mapju un failu nosaukumi jāveido tikai no burtiem, cipariem, "-", "_" vai ".". Nav pieļaujami tukšumi vai apakšsvītras.</li>
 
 <li>Kolīdz faili, sīkbildes un pārstāvības ir korekti saliktas mapēs, ejam uz: <span class="pwgScreen">Administrēšanu &raquo; Kategorijām &raquo; Sinchronizšānu</span></li>
diff --git a/language/nb_NO/admin.lang.php b/language/nb_NO/admin.lang.php
index c46a78a0d..4acf3b315 100644
--- a/language/nb_NO/admin.lang.php
+++ b/language/nb_NO/admin.lang.php
@@ -96,9 +96,9 @@ $lang['Linked albums'] = 'Linkede album';
 $lang['Lock gallery'] = 'Lås galleri';
 $lang['Maintenance'] = 'Vedlikehold';
 $lang['Edit album permissions'] = 'Rediger album rettigheter';
-$lang['Manage permissions for group "%s"'] = 'Behandle tillatelser for gruppen "%s"';
-$lang['Manage permissions for user "%s"'] = 'Behandle tillatelser for bruker "%s"';
-$lang['Manage tags'] = 'Behandle tags';
+$lang['Manage permissions for group "%s"'] = 'Rediger tillatelser for gruppen "%s"';
+$lang['Manage permissions for user "%s"'] = 'Rediger tillatelser for bruker "%s"';
+$lang['Manage tags'] = 'Rediger tagger';
 $lang['Members'] = 'Medlemmer';
 $lang['Metadata synchronized from file'] = 'Metadata synkronisert fra fil';
 $lang['Move albums'] = 'Flytt album';
@@ -181,7 +181,7 @@ $lang['Private'] = 'Privat';
 $lang['Public'] = 'Offentlig';
 $lang['Find a new representant by random'] = 'Finn en ny tilfeldig representant';
 $lang['Public / Private'] = 'Offentlig / Privat';
-$lang['Manage authorizations for selected albums'] = 'Behandle autorisasjoner for valgt album';
+$lang['Manage authorizations for selected albums'] = 'Rediger autorisasjoner for valgt album';
 $lang['Virtual album added'] = 'Virtuelt album lagt til';
 $lang['Virtual album deleted'] = 'Virtuelt album slettet';
 $lang['Access type'] = 'Tilgangstype type';
@@ -215,7 +215,7 @@ $lang['Lock'] = 'Lås';
 $lang['Locked'] = 'Låst';
 $lang['manage album photos'] = 'behandle album elementer';
 $lang['manage sub-albums'] = 'behandle grunn-album';
-$lang['Manage'] = 'Behandle';
+$lang['Manage'] = 'Rediger';
 $lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = 'Prossessen svarer ikke, behandling fortsetter [Estimert tid: %d sekund].';
 $lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'Prossessen svarer ikke, behandling fortsetter [Estimert tid: %d sekunder].';
 $lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'Tiden å forberede liste over brukere som vil bli mailet er begrenset. Andre brukere er ikke listet.';
@@ -508,7 +508,7 @@ $lang['Optimizations have been completed with some errors.'] = 'Optimalisering h
 $lang['Modify information'] = 'Endre informasjon';
 $lang['nothing'] = 'ingen ting';
 $lang['overrides existing values with empty ones'] = 'overskriver eksisterende verdier med tomme';
-$lang['Manage photo ranks'] = 'Behandle bilde rangering';
+$lang['Manage photo ranks'] = 'Rediger bilde rangering';
 $lang['Edit ranks'] = 'Rediger rangering';
 $lang['No photo in this album'] = 'Ingen elementer i dette album';
 $lang['Images manual order was saved'] = 'Bilders manuelle rekkefølge lagret';
@@ -560,7 +560,7 @@ $lang['Uploaded Photos'] = 'Opplastede bilder';
 $lang['%d photos uploaded'] = '%d foto opplastet';
 $lang['Privacy level set to "%s"'] = 'Privat nivå satt til "%s"';
 $lang['Album "%s" now contains %d photos'] = 'Album "%s" består nå av %d bilder';
-$lang['Manage this set of %d photos'] = 'Behandle disse %d bildene';
+$lang['Manage this set of %d photos'] = 'Rediger disse %d bildene';
 $lang['Select files'] = 'Velg filer';
 $lang['Everybody'] = 'Alle';
 $lang['Who can see these photos?'] = 'Hvem kan se disse bildene?';
@@ -758,7 +758,7 @@ $lang['I decide to update anyway'] = 'Jeg vil oppgradere allikevel';
 $lang['Ignore All'] = 'Ignorer alle';
 $lang['Ignore this update'] = 'Ignorer denne oppdatering';
 $lang['Include history data (Warning: server memory limit may be exceeded)'] = 'Inkluder historisk data (Advarsel: serverens minne kan overstiges)';
-$lang['Manage Permissions'] = 'Behandle rettigheter';
+$lang['Manage Permissions'] = 'Rediger rettigheter';
 $lang['Maximum file size: %sB.'] = 'Maksimal filstørrelse: %sB.';
 $lang['Merge selected tags'] = 'Flett merkede bildetags';
 $lang['Merge tags'] = 'Flett bildetags';
@@ -917,7 +917,7 @@ $lang['Name of the duplicate'] = 'Navn på duplikater';
 $lang['Source tag'] = 'Kildetagg';
 $lang['Tag "%s" is now a duplicate of "%s"'] = 'Tagg "%s" er nå en duplikat av "%s"';
 $lang['Landscape'] = 'Liggende';
-$lang['Manage photos'] = 'Behandle bilder';
+$lang['Manage photos'] = 'Rediger bilder';
 $lang['Minimum height'] = 'Minimum høyde';
 $lang['Minimum width'] = 'Minimum bredde';
 $lang['Number of albums per page'] = 'Antall album pr side';
@@ -926,7 +926,7 @@ $lang['Portrait'] = 'Portrett';
 $lang['View in gallery'] = 'Se i galleri';
 $lang['Ratio'] = 'Ratio';
 $lang['Duplicate'] = 'Duplikat';
-$lang['Manage the members'] = 'Behandle medlemmene';
+$lang['Manage the members'] = 'Administrer medlemmer';
 $lang['Merge selected groups'] = 'Flett markerte grupper';
 $lang['No group selected, no action possible.'] = 'Ingen gruppe markert, kan ikke gjøre noe.';
 $lang['No members to manage'] = 'Ingen medlemmer å behandle';
diff --git a/language/nb_NO/common.lang.php b/language/nb_NO/common.lang.php
index 89124bc79..79a3148ce 100644
--- a/language/nb_NO/common.lang.php
+++ b/language/nb_NO/common.lang.php
@@ -46,7 +46,7 @@ $lang['User: %s'] = "Bruker: %s";
 $lang['Email: %s'] = 'E-post: %s';
 $lang['Admin: %s'] = "Admin: %s";
 $lang['Registration of %s'] = "Registrering av %s";
-$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = "Feil status for bruker \"gjest\", default status vil bli brukt. Vennligst kontakt webmaster.";
+$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Feil status for bruker "gjest", standard status vil bli brukt. Vennligst kontakt webmaster.';
 $lang['this email address is already in use'] = 'En annen bruker har allerede denne e-postadressem';
 $lang['Tag results for'] = "Tag resultat for";
 $lang['from %s to %s'] = "fra %s til %s";
@@ -54,9 +54,9 @@ $lang['Play of slideshow'] = 'Start slideshow';
 $lang['Pause of slideshow'] = "Pause slideshow";
 $lang['Repeat the slideshow'] = "Gjenta slideshow";
 $lang['Not repeat the slideshow'] = "Ikke repeter slideshow";
-$lang['Reduce diaporama speed'] = "Reduser slideshow hastighet";
-$lang['Accelerate diaporama speed'] = "Øk slideshow hastighet";
-$lang['Submit'] = "Send";
+$lang['Reduce diaporama speed'] = 'Reduser hastighet på slideshow';
+$lang['Accelerate diaporama speed'] = 'Øk hastighet på slideshow';
+$lang['Submit'] = 'Lagre';
 $lang['Yes'] = "Ja";
 $lang['No'] = "Nei";
 $lang['%d photo'] = "%d bilde";
@@ -64,7 +64,7 @@ $lang['%d photos'] = "%d bilder";
 $lang['%d photo is also linked to current tags'] = '%d bilde er også linket til gjeldende stikkord';
 $lang['%d photos are also linked to current tags'] = '%d bilder er også linket til gjeldende stikkord';
 $lang['display photos linked to this tag'] = 'Se kun bilder linket til gjeldende stikkord';
-$lang['photos posted during the last %d days'] = "bilder postet innen de siste %d dager";
+$lang['photos posted during the last %d days'] = 'opplastede bilder de siste %d dager';
 $lang['Piwigo Help'] = "Piwigo hjelp";
 $lang['Rank'] = "Rangering";
 $lang['group by letters'] = "ordne etter bokstav";
@@ -74,7 +74,7 @@ $lang['cloud'] = 'sky';
 $lang['Reset to default values'] = "Sett tilbake til standard verdier";
 $lang['delete all photos from your favorites'] = "slett alle bilder fra dine favoritter";
 $lang['Sent by'] = "Sendt av";
-$lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = "Cookies er blokkert eller ikke støttet av din nettleser. Du må aktivere cookies for å logge inn.";
+$lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = 'Informasjonskapsler er blokkert eller ikke støttet av din nettleser. Du må aktivere informasjonskapsler for å logge inn.';
 $lang['day'][0] = 'Søndag';
 $lang['day'][1] = 'Mandag';
 $lang['day'][2] = 'Tirsdag';
@@ -118,7 +118,7 @@ $lang['Filesize'] = 'Filstørrelse';
 $lang['Filter and display'] = 'Filtrer og vis';
 $lang['Filter'] = 'Filter';
 $lang['Forgot your password?'] = 'Glemt passord?';
-$lang['Go through the gallery as a visitor'] = 'Naviger galleriet som gjest';
+$lang['Go through the gallery as a visitor'] = 'Naviger i galleriet som gjest';
 $lang['Help'] = 'Hjelp';
 $lang['Identification'] = 'Identifikasjon';
 $lang['Photos only RSS feed'] = 'Bare bilder RSS feed';
@@ -183,10 +183,10 @@ $lang['all'] = 'alle';
 $lang['ascending'] = 'stigende';
 $lang['author(s) : %s'] = 'forfatter(e) : %e';
 $lang['Expand all albums'] = 'Vis alle album';
-$lang['posted after %s (%s)'] = 'postet etter %s (%s)';
-$lang['posted before %s (%s)'] = 'postet before %s (%s)';
-$lang['posted between %s (%s) and %s (%s)'] = 'postet mellom %s (%s) og %s (%s)';
-$lang['posted on %s'] = 'postet den %s';
+$lang['posted after %s (%s)'] = 'opplastet etter %s (%s)';
+$lang['posted before %s (%s)'] = 'opplastet before %s (%s)';
+$lang['posted between %s (%s) and %s (%s)'] = 'opplastet mellom %s (%s) og %s (%s)';
+$lang['posted on %s'] = 'opplastet den %s';
 $lang['Best rated'] = 'Best rangert';
 $lang['display best rated photos'] = 'vis de best rangerte bildene';
 $lang['Calendar'] = 'Kalender';
@@ -201,17 +201,17 @@ $lang['comment date'] = 'Kommentert dato';
 $lang['Comment'] = 'kommentar';
 $lang['Your comment has been registered'] = 'Din kommentar er registrert';
 $lang['Anti-flood system : please wait for a moment before trying to post another comment'] = 'Overbuffringsvern : Vennligst vent før du prøver å legge til den ny kommentar';
-$lang['Your comment has NOT been registered because it did not pass the validation rules'] = 'Din kommentar har IKKE blitt registrert da den ikke ble validert';
+$lang['Your comment has NOT been registered because it did not pass the validation rules'] = 'Din kommentar har IKKE blitt registrert da den ikke ble godkjent';
 $lang['An administrator must authorize your comment before it is visible.'] = 'En administrator må godkjenne din kommentar før den blir synlig.';
 $lang['This login is already used by another user'] = 'Denne innloggingen er allerede i bruk.';
 $lang['Comments'] = 'Kommentarer';
 $lang['Add a comment'] = 'Legg til en kommentar';
-$lang['created after %s (%s)'] = 'oprettet etter %s (%s)';
+$lang['created after %s (%s)'] = 'opprettet etter %s (%s)';
 $lang['created before %s (%s)'] = 'opprettet før %s (%s)';
 $lang['created between %s (%s) and %s (%s)'] = 'opprettet mellom %s (%s) og %s (%s)';
 $lang['created on %s'] = 'opprettet den %s';
-$lang['Customize'] = 'Egendefinert';
-$lang['Your Gallery Customization'] = 'Ditt galleri egendefinert';
+$lang['Customize'] = 'Tilpass';
+$lang['Your Gallery Customization'] = 'Innstillinger for ditt galleri';
 $lang['Default'] = 'Standard';
 $lang['delete this photo from your favorites'] = 'slett bildet fra dine favoritter';
 $lang['Delete'] = 'Slett';
@@ -258,8 +258,8 @@ $lang['New password'] = 'Nytt passord';
 $lang['Rate this photo'] = 'Gi karakter på dette bildet';
 $lang['Next'] = 'Neste';
 $lang['no rate'] = 'ingen karakter';
-$lang['Photos posted within the last %d day.'] = 'Elementer posted kun de %d siste dager.';
-$lang['Photos posted within the last %d days.'] = 'Elementer posted kun de %d siste dager.';
+$lang['Photos posted within the last %d day.'] = 'Kun opplastede bilder den %d siste dagen.';
+$lang['Photos posted within the last %d days.'] = 'Kun opplastede bilder de %d siste dager.';
 $lang['password updated'] = 'passord oppdatert';
 $lang['Recent period must be a positive integer value'] = 'Siste periode må være en positiv verdi';
 $lang['photo'] = 'bilde';
@@ -277,8 +277,8 @@ $lang['Recent photos'] = 'Siste bilder';
 $lang['display most recent photos'] = 'Viser de sist sette bilder';
 $lang['Redirection...'] = 'Videresender...';
 $lang['Please, enter a login'] = 'Vennligst logg inn';
-$lang['login mustn\'t end with a space character'] = 'login må ikke ende med et mellomrom';
-$lang['login mustn\'t start with a space character'] = 'login må ikke starte med et mellomrom';
+$lang['login mustn\'t end with a space character'] = 'brukernavn kan ikke ende med et mellomrom';
+$lang['login mustn\'t start with a space character'] = 'brukernavn kan ikke starte med et mellomrom';
 $lang['this login is already used'] = 'denne innloggingen er allerede i bruk';
 $lang['mail address must be like xxx@yyy.eee (example : jack@altern.org)'] = 'mailaddresse må være tilsvarende xxx@yyy.eee (eksempel : jack@altern.org)';
 $lang['Auto login'] = 'Auto innlogging';
@@ -300,7 +300,7 @@ $lang['Search results'] = 'Søke resultat';
 $lang['Search in sub-albums'] = 'Søk i under-album';
 $lang['searched words : %s'] = 'søkte ord : %';
 $lang['Contact'] = 'Kontakt';
-$lang['set as album representative'] = 'sett som album representant';
+$lang['set as album representative'] = 'bruk som albumets miniatyrbilde';
 $lang['Show number of comments'] = 'Vis antall kommentarer';
 $lang['Show number of hits'] = 'Vis antall treff';
 $lang['slideshow'] = 'slideshow';
@@ -322,10 +322,10 @@ $lang['Edit a comment'] = 'Endre en kommentar';
 $lang['Are you sure?'] = 'Er du sikker?';
 $lang['(!) This comment requires validation'] = '(!) Denne kommentaren krever godkjenning';
 $lang['Welcome'] = 'Velkommen';
-$lang['Welcome to your Piwigo photo gallery!'] = 'Velkommen til din Piwigo photo gallery!';
+$lang['Welcome to your Piwigo photo gallery!'] = 'Velkommen til ditt Piwigo bildegalleri!';
 $lang['... or browse your empty gallery'] = '... eller bla i ditt tomme galleri';
 $lang['... or please deactivate this message, I will find my way by myself'] = '... eller vennligst deaktiver denne beskjeden, jeg vil finne ut av det selv';
-$lang['Hello %s, your Piwigo photo gallery is empty!'] = 'Hallo %, ditt Piwigo photo gallery er tomt!';
+$lang['Hello %s, your Piwigo photo gallery is empty!'] = 'Hallo %s, ditt Piwigo bildegalleri er tomt!';
 $lang['I want to add photos'] = 'Jeg vil legge til foto';
 $lang['Manage this user comment: %s'] = 'Behandle denne brukers kommentar: %s';
 $lang['Email address is missing. Please specify an email address.'] = 'E-postadresse mangler. Vennligst skriv en e-postadresse.';
diff --git a/language/nb_NO/help/photos_add_ftp.html b/language/nb_NO/help/photos_add_ftp.html
index 50028f072..dbbd9b4d8 100644
--- a/language/nb_NO/help/photos_add_ftp.html
+++ b/language/nb_NO/help/photos_add_ftp.html
@@ -36,42 +36,36 @@ Gratulerer! Du har nå laget ditt første album i ditt foto galleri.
 galleri (men bruker mange muligheter):</p>
 
     <pre>
-.
-|-- admin
-|-- doc
-|-- gallerier
-|   |-- album-1
-|   |   |-- album-1.1
-|   |   |   |-- album-1.1.1
-|   |   |   |   |-- album-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- miniatyrbilder
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- album-1.1.1.2
-|   |   |   +-- album-1.1.2
-|   |   |-- album-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- miniatyrbilder
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- album-1.3
-|   +-- album-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- miniatyrbilder
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool</pre>
-
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
   </li>
 
-  <li>Untagen de med navnet "miniatyrbilder", "pwg_high" eller "pwg_representative" (se forklaring
+  <li>Untagen de med navnet "pwg_representative" eller "pwg_format" (se forklaring
 
 under), vil hver mappe under "gallerier" representerer et album. Det er ingen begrensning på dybden
 
@@ -98,6 +92,8 @@ standard med et icon tillhørende fil endelsen. Valgfritt, kan du assosiere et m
 
 og en representativ fil (se video.avi i eksempelet over).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Advarsel</em>: navnet på mapper og filer må kun inneholde bokstaver, figurer, "-", "_"
 
 eller ".". Ingen tomme mellomrom, ei heller opphøyde karakterer.</li>
@@ -109,35 +105,3 @@ class="pwgScreen">Administrasjon &raquo; Verktøy &raquo;
 
 </ul>
 </fieldset>
-
-<fieldset>
-  <legend>Miniatyr bilder</legend>
-<ul>
-
-  <li>Hvert bilde må ha sitt miniatyr bilde.</li>
-
-  <li>Miniatyr bilde blir lagret i "miniatyrbilde " under mappe i album
-  mappen. Miniatyr bildene har det samme filnavnet som bildet det passer opp mot, med konfigurasjons
-
-parametrene <code>prefix_thumbnail</code> som prefix (se <span
-
-class="filename">inkluder/config.inc.php</span>).</li>
-
-  <li>Miniatyr bilde filer bør ikke nødvendigvis ha samme fil endelse som det assosierte bildet (Eks
-
-".jpg" bilde kan ha ".GIF" endelse).</li>
-
-  <li>Det anbefales å bruker en ekstern modul for å lage miniatyr bilder.</li>
-
-  <li>Bruken av miniatyr bilde oprettelses verktøyet integrert i Piwigo er ikke anbefalt, Dette
-
-fordi den resulterte kvaliteten kan være skuffende og den vil bruke mye server ressurser (Dette kan
-
-være et stort problem på en delt server).
-
-  <li>Om du vleger å bruker web serveren til å lage miniatyr bilder, må du gi skrive rettigheter på
-
-alle album mappene.</li>
-
-</ul>
-</fieldset>
\ No newline at end of file
diff --git a/language/nl_NL/help/photos_add_ftp.html b/language/nl_NL/help/photos_add_ftp.html
index b9997a940..262f2db52 100644
--- a/language/nl_NL/help/photos_add_ftp.html
+++ b/language/nl_NL/help/photos_add_ftp.html
@@ -26,38 +26,33 @@
     <p>Categorie mappen zijn in de Piwigo map "galleries". Bekijk de mapstructuur van een kleine gallerie (maar met een hoop mogelijkheden) :</p>
 
     <pre>
-.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- categorie-1
-|   |   |-- categorie-1.1
-|   |   |   |-- categorie-1.1.1
-|   |   |   |   |-- categorie-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- categorie-1.1.1.2
-|   |   |   +-- categorie-1.1.2
-|   |   |-- categorie-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- categorie-1.3
-|   +-- categorie-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool</pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
 
   </li>
   
diff --git a/language/nn_NO/help/photos_add_ftp.html b/language/nn_NO/help/photos_add_ftp.html
index f44c646af..486c3839b 100755
--- a/language/nn_NO/help/photos_add_ftp.html
+++ b/language/nn_NO/help/photos_add_ftp.html
@@ -42,11 +42,20 @@ galleries
     |-- video-fraa-fly.avi
     +-- pwg_representative
         +-- video-fraa-fly.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
 
-  <li>Bortsett frå "pwg_representative" (sjå forklaring under), vil kvar mappe under "galleries" lage eit album. Det er ingen avgrensing på djubde.</li>
+  <li>Bortsett frå "pwg_representative" and "pwg_format" (sjå forklaring under), vil kvar mappe under "galleries" lage eit album. Det er ingen avgrensing på djubde.</li>
 
   <li>Som utgangspunkt er eit element representera av ei file. Ei fil kan vera eit
   Piwigo element om filtypa er blant <code>file_ext</code>
@@ -57,6 +66,8 @@ galleries
 
   <li>Ingen bilet-element (video, lyd, tekstfiler, eller kva som helst...) er som standard vist med eit ikon som samsvarar med filtypa. Valfritt, kan du knytte til ei miniatyrbilete og ein representatnt--fil til ei fil (sjå video.avi i dømet over).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Varsel</em>: namn på mapper og filer kan bare innehalde bokstavar (a - z, A - Z), tal, "-", "_" or ".". Ikkje bruk mellomrom eller spesielle tegn.</li>
 
   <li>Når bilete er plassera korrekt i mapper, gå til: <span class="pwgScreen">Administrasjon &raquo; Verktøy &raquo;
diff --git a/language/pl_PL/help/photos_add_ftp.html b/language/pl_PL/help/photos_add_ftp.html
index 60919d276..e3ec6c124 100644
--- a/language/pl_PL/help/photos_add_ftp.html
+++ b/language/pl_PL/help/photos_add_ftp.html
@@ -43,11 +43,20 @@ galleries
     |-- video-from-plane.avi
     +-- pwg_representative
         +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
   
-  <li>Poza "pwg_representative" (wyjaśnienie poniżej), każdy podkatalog w katalogu "galleries" tworzy kategorię. Nie ma limitu na poziomy zagłębień katalogów.</li>
+  <li>Poza "pwg_representative" and "pwg_format" (wyjaśnienie poniżej), każdy podkatalog w katalogu "galleries" tworzy kategorię. Nie ma limitu na poziomy zagłębień katalogów.</li>
 
   <li>Ogólnie element jest reprezentowany przez plik. Plik może być elementem
   Piwigo jeżeli jego rozszerzenie jest zawarte <code>file_ext</code>
@@ -60,6 +69,8 @@ galleries
   Opcjonalnie można powiązać miniaturę przez pwg_representative.
   Przyjrzyj się przykładowi powyżej dla video.avi.</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+  
   <li><em>Ostrzeżenie</em>: nazwy katalogów oraz plików mogą zawierać tylko litery, cyfry oraz znaki "-", "_" lub ".". Nie mogą zawierać innych znaków, znaku spacji ani polskich liter.
 
   <li>Po umieszczeniu plików, miniatur oraz reprezentantów,
diff --git a/language/pt_BR/help/photos_add_ftp.html b/language/pt_BR/help/photos_add_ftp.html
index 21d558166..e408fa070 100644
--- a/language/pt_BR/help/photos_add_ftp.html
+++ b/language/pt_BR/help/photos_add_ftp.html
@@ -26,38 +26,33 @@
     usando muitos recursos) :</p>
 
     <pre>
-.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- category-1
-|   |   |-- category-1.1
-|   |   |   |-- category-1.1.1
-|   |   |   |   |-- category-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- category-1.1.1.2
-|   |   |   +-- category-1.1.2
-|   |   |-- category-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- category-1.3
-|   +-- category-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool</pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
 
   </li>
   
@@ -77,6 +72,8 @@
   <li>Outros itens (video, sons, arquivos de texto, o que você quiser...) são
   por padrão representados por um ícone correspondente à extensão do nome de arquivo. Você tem a opção de associar uma miniatura e um arquivo representativo (veja video.avi no exemplo acima).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Atenção</em>: o nome dos diretórios e dos arquivos devem conter apenas letras, números, "-", "_" ou ".". Não use espaço em branco e nem caracteres acentuados.</li>
 
   <li>Uma vez que os arquivos, as miniaturas e representativos estiverem corretamente alocados nos diretórios,
@@ -86,21 +83,3 @@
 </ul>
 
 </fieldset>
-<fieldset>
-  <legend>Miniaturas (Thumbnails)</legend>
-<ul>
-
-  <li>Cada foto deve ter a sua miniatura.</li>
-
-  <li>As miniaturas estão armazenadas no subdiretório "thumbnail" no diretório das categorias. 
-      A miniatura tem o mesmo nome de arquivo que a foto correspondente, com <em>TN-</em> como prefixo.</li>
-
-  <li><em>Aviso</em>: use um módulo externo para a criação das miniaturas.</li>
-
-  <li>Mesmo se isto não é recomendado (qualidade da imagem, carregamento do servidor, etc), você pode usar a página<span>
-  class="pwgScreen">Administração &raquo; Imagens &raquo; Miniaturas</span> para criar as miniaturas.</li>
-
-  <li>Dê acesso de escrita para todos os diretórios das categorias.</li>
-
-</ul>
-</fieldset>
\ No newline at end of file
diff --git a/language/pt_PT/help/photos_add_ftp.html b/language/pt_PT/help/photos_add_ftp.html
index 1d63f816f..f51944910 100644
--- a/language/pt_PT/help/photos_add_ftp.html
+++ b/language/pt_PT/help/photos_add_ftp.html
@@ -25,38 +25,33 @@ Parab&eacute;ns! Voc&ecirc; acabou de criar o primeiro &aacute;lbum da sua galer
 	<p>As pastas dos &aacute;lbums est&atilde;o na pasta "galleries" no Piwigo. Segue aqui a &aacute;rvore de pastas de uma pequena galeria (mas usando muitos recursos) :</p>
 
     <pre>
-.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- category-1
-|   |   |-- category-1.1
-|   |   |   |-- category-1.1.1
-|   |   |   |   |-- category-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- category-1.1.1.2
-|   |   |   +-- category-1.1.2
-|   |   |-- category-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- category-1.3
-|   +-- category-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool</pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
 
   </li>
   
@@ -70,6 +65,8 @@ Parab&eacute;ns! Voc&ecirc; acabou de criar o primeiro &aacute;lbum da sua galer
 
   <li>Outros itens (video, sons, arquivos de texto, o que voc&ecirc; quiser...) s&atilde;o por padr&atilde;o representados por um &iacute;cone correspondente &agrave; extens&atilde;o do nome de arquivo. Voc&ecirc; tem a op&ccedil;&atilde;o de associar uma miniatura e um ficheiro representativo (veja video.avi no exemplo acima).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Aten&ccedil;&atilde;o</em>: o nome das pastas e dos ficheiros devem conter apenas letras, n&uacute;meros, "-", "_" ou ".". N&atilde;o use espa&ccedil;o em branco e nem caracteres acentuados.</li>
 
   <li>Uma vez que os ficheiros, as miniaturas e representativos estiverem corretamente alocados nas pastas,v&aacute; at&eacute; : <span class="pwgScreen">Ferramentas &raquo; Sincronizar</span></li>
@@ -77,20 +74,3 @@ Parab&eacute;ns! Voc&ecirc; acabou de criar o primeiro &aacute;lbum da sua galer
 </ul>
 
 </fieldset>
-<fieldset>
-  <legend>Miniaturas (Thumbnails)</legend>
-<ul>
-
-  <li>Cada foto deve ter a sua miniatura.</li>
-
-  <li>As miniaturas est&atilde;o armazenadas na subpasta "thumbnail" na pasta das categorias. 
-      A miniatura tem o mesmo nome de ficheiro que a foto correspondente, com <em>TN-</em> como prefixo.</li>
-
-  <li><em>Aten&ccedil;&atilde;o</em>: use um m&oacute;dulo externo para a cria&ccedil;&atilde;o das miniaturas.</li>
-
-  <li>Embora n&atilde;o seja recomendado (qualidade da imagem, carga do servidor, etc), pode usar a p&aacute;gina <span class="pwgScreen">Ferramentas &raquo; Miniaturas</span> para criar as miniaturas.</li>
-
-  <li>D&ecirc; permiss&otilde;es de escrita para todas as pastas dos albums.</li>
-
-</ul>
-</fieldset>
diff --git a/language/ru_RU/help/photos_add_ftp.html b/language/ru_RU/help/photos_add_ftp.html
index c02a68c01..9856d14f1 100644
--- a/language/ru_RU/help/photos_add_ftp.html
+++ b/language/ru_RU/help/photos_add_ftp.html
@@ -41,6 +41,15 @@ galleries
     |-- video-from-plane.avi
     +-- pwg_representative
         +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
@@ -58,6 +67,8 @@ galleries
   представлены иконками соответствующими расширению файла. Дополнительно, Вы можете
   связать миниатюру и представительный файл (см. video.avi в примере выше).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Внимание</em>: имена папок и файлов должны содержать только латинские буквы,
   цифры, "-", "_" или ".". Не используйте пробелы и спецсимволы.</li>
 
diff --git a/language/sk_SK/help/photos_add_ftp.html b/language/sk_SK/help/photos_add_ftp.html
index 5130063d7..2bc825f4b 100644
--- a/language/sk_SK/help/photos_add_ftp.html
+++ b/language/sk_SK/help/photos_add_ftp.html
@@ -27,38 +27,33 @@ Gratulujeme! Práve ste vytvorili vašu prvú galériu fotografií vo Vašej Piw
     "galleries". Tu je ukážka malej adresárovej štruktúry Piwigo (ktorá ale využívá veľa vlastností Piwigo):</p>
 
     <pre>
-.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- kategoria-1
-|   |   |-- kategoria-1.1
-|   |   |   |-- kategoria-1.1.1
-|   |   |   |   |-- kategoria-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- svatba.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-svatba.jpg
-|   |   |   |   |   +-- svatba.jpg
-|   |   |   |   +-- kategoria-1.1.1.2
-|   |   |   +-- kategoria-1.1.2
-|   |   |-- kategoria-1.2
-|   |   |   |-- slon.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-slon.jpg
-|   |   +-- kategoria-1.3
-|   +-- kategoria-2
-|       |-- teliatko.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-teliatko.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool</pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
 
   </li>
 
@@ -74,6 +69,8 @@ Gratulujeme! Práve ste vytvorili vašu prvú galériu fotografií vo Vašej Piw
 
   <li>Elementy, ktoré nie sú obrázky (video, zvuk, textové súbory, čokoľvek chcete...) majú ako východzí náhľad ikonu, ktorá odpovedá ich prípone. Voliteľne môžete priradiť náhľad a reprezentatívny súbor (viď. video.avi v príklade vyššie).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Varovanie</em>: názvy adresárov a súborov musia obsahovať len písmená, čísla, "-", "_" alebo ".". Žiadne medzery alebo znaky s diakritikou.</li>
 
   <li>Keď sú elementy, obrázky, náhľady a reprezentatívne súbory umiestnené v adresárovej štruktúre, prejdite na: <span class="pwgScreen">Administrácia &raquo; Kategória &raquo;
@@ -81,22 +78,3 @@ Gratulujeme! Práve ste vytvorili vašu prvú galériu fotografií vo Vašej Piw
 
 </ul>
 </fieldset>
-
-<fieldset>
-  <legend>Náhľady</legend>
-<ul>
-
-  <li>Všetky obrázky (fotografie) musia mať priradený náhľad.</li>
-
-  <li>Náhľady sú umiestnené v podadresári "thumbnail", ktorý je v adresári kategórie. Náhľad má rovnaký názov ako jemu odpovídajúci obrázok s prefixom podľa konfiguračného parametra <code>prefix_thumbnail</code> (viď. <span class="filename">include/config.inc.php</span>).</li>
-
-  <li>Náhľad nemusí mať nutne rovnakú príponu ako jemu odpovedajúcí obrázok (napríklad ".jpg", obrázok môže mať náhľad s ".GIF" príponou).</li>
-
-  <li>Odporúčame použiť externú aplikáciu pre tvorbu náhľadov.</li>
-
-  <li>Vytváranie náhľadov pomocou Piwigo môže viesť k zlej kvalite vytvorených náhľadov, protože tá závisí na zdrojoch servra (a toto môže byť na zdielaných servroch (webhosting) problém).
-
-  <li>Pokiaľ budete aj tak vytvárať náhľady pomocou Piwigo na servri, tak musíte povoliť prístup pre zápis do všetkých adresárov "galleries" a všetkých podadresárov.</li>
-
-</ul>
-</fieldset>
diff --git a/language/sl_SI/help/help_misc.html b/language/sl_SI/help/help_misc.html
new file mode 100755
index 000000000..f69be2196
--- /dev/null
+++ b/language/sl_SI/help/help_misc.html
@@ -0,0 +1,9 @@
+<p>Ko ste ustvarili svojo galerijo jo lahko nastavite za obiskovalce
+<ul>
+	<li>Željeni privzeti prikaz v <span class="pwgScreen">Administracija &raquo; Konfiguracija &raquo; Možnosti</span> na zavihku <span class="pwgScreen">Nastavitve gosta</span></li>
+	<li>Privzeto preobleko - temo v <span class="pwgScreen">Administracija &raquo; Konfiguracija &raquo; Teme</span></li>
+	<li>Privzet jezik v <span class="pwgScreen">Administracija &raquo; Konfiguracija &raquo; Jeziki</span></li>
+ </ul>
+ Privzeto, bo vsak nov uporabnik podedoval te lastnosti ob registraciji.
+</p>
+<p>V primeru dodatnih vprašanj, vas Piwigo skupnost pozdravlja na <a href="http://piwigo.org/forum" target="_blank">svojem forumu</a>.</p>
\ No newline at end of file
diff --git a/language/sr_RS/admin.lang.php b/language/sr_RS/admin.lang.php
index 00748f4b3..b91794877 100644
--- a/language/sr_RS/admin.lang.php
+++ b/language/sr_RS/admin.lang.php
@@ -986,3 +986,8 @@ $lang['Y Repeat'] = 'Понављање по y';
 $lang['No user is permitted to see this private album'] = 'Ниједном кориснику није дозвољено да види овај лични албум';
 $lang['No recipient selected'] = 'Није одабран прималац';
 $lang['Edit user'] = 'Измени корисника';
+$lang['Delete %d orphan photos'] = 'Обриши %d слике без родитеља';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Свако послато е-писмо ће садржати сопствени кључ за пријаву на адресу, важи %s.';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Из безбедоносних разлога, кључеви за пријаву не раде за администраторе.';
+$lang['Orphans'] = 'Без родитеља';
+$lang['Recipients'] = 'Примаоци';
\ No newline at end of file
diff --git a/language/sv_SE/help/photos_add_ftp.html b/language/sv_SE/help/photos_add_ftp.html
index 028058f21..948655639 100755
--- a/language/sv_SE/help/photos_add_ftp.html
+++ b/language/sv_SE/help/photos_add_ftp.html
@@ -43,11 +43,20 @@ galleries
     |-- video-from-plane.avi
     +-- pwg_representative
         +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
 
-  <li>Förutom "pwg_representative" (se förklaring nedan) så skapar varje katalog i "galleries" ett eget album. Det finns ingen begränsning på hur många under album som går att skapa.</li>
+  <li>Förutom "pwg_representative" and "pwg_format" (se förklaring nedan) så skapar varje katalog i "galleries" ett eget album. Det finns ingen begränsning på hur många under album som går att skapa.</li>
 
   <li>>I grunden representeras varje objekt av en fil. En fil kan vara ett
   Piwigo objekt om filändelsen är med i <code>file_ext</code>
@@ -60,6 +69,8 @@ galleries
   Du kan om du vill associera en "thumbnail" fil som visar istället för ikonen.
   (se video.avi i exemplet ovan).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Varning</em>: Katalog och filnamn får bara bestå av bokstäver och dessa tecken "-", "_" or ".". Inga mellanslag eller accentuerade
   bokstäver.</li>
 
diff --git a/language/sv_SE/upgrade.lang.php b/language/sv_SE/upgrade.lang.php
index 90e709504..036adff1c 100644
--- a/language/sv_SE/upgrade.lang.php
+++ b/language/sv_SE/upgrade.lang.php
@@ -31,7 +31,7 @@ $lang['total upgrade time'] = 'total uppgraderings tid';
 $lang['total SQL time'] = 'Total SQL tid';
 $lang['SQL queries'] = 'SQL-frågor';
 $lang['Upgrade informations'] = 'Uppgraderingsinformation';
-$lang['Perform a maintenance check in [Administration>Tools>Maintenance] if you encounter any problem.'] = 'Gör en underhållskontroll i mynyn [Administration> Verktyg> Underhåll] om du stöter på några problem. .';
+$lang['Perform a maintenance check in [Administration>Tools>Maintenance] if you encounter any problem.'] = 'Gör en underhållskontroll i menyn [Administration> Verktyg> Underhåll] om du stöter på några problem.';
 $lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = 'Som en försiktighetsåtgärd, har följande insticksmoduler avaktiverats, Du måste kontrollera alla plugins uppgraderingar före återaktivering av dem:';
 $lang['Only administrator can run upgrade: please sign in below.'] = 'Endast en administratör kan köra uppgraderingen: Logga in nedan.';
 $lang['You do not have access rights to run upgrade'] = 'Du har inte behörighet att köra uppgradering';
@@ -40,5 +40,3 @@ $lang['User permissions and group permissions have been erased'] = 'Användare o
 $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = 'miniatyrbilder Endast prefix och webmaster postadress har sparats från tidigare konfiguration';
 $lang['In <i>%s</i>, before <b>?></b>, insert:'] = 'I <i>%s</i>, innan <b>?></b>, infoga:';
 $lang['As a precaution, following themes have been deactivated. You must check for themes upgrade before reactiving them:'] = 'Som en försiktighetsåtgärd, har följande teman har avaktiverats. Du måste kolla tema uppgraderingar innan du aktivera dem:';
-
-?>
\ No newline at end of file
diff --git a/language/tr_TR/help/photos_add_ftp.html b/language/tr_TR/help/photos_add_ftp.html
index fdb96cdd8..78048e564 100755
--- a/language/tr_TR/help/photos_add_ftp.html
+++ b/language/tr_TR/help/photos_add_ftp.html
@@ -41,11 +41,20 @@ galleries
     |-- video-from-plane.avi
     +-- pwg_representative
         +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
 
-  <li>Except for "pwg_representative" (see explanations below), each directory under "galleries" produces a album. There is no limit on deepness.</li>
+  <li>Except for "pwg_representative" and "pwg_format" (see explanations below), each directory under "galleries" produces a album. There is no limit on deepness.</li>
 
   <li>Basically, an element is represented by a file. A file can be a
   Piwigo element if its extension is among <code>file_ext</code>
@@ -54,10 +63,12 @@ galleries
   be a picture if its extension is among <code>picture_ext</code>
   configuration parameter possibilities.</li>
 
-  <li>No photo elements (video, sounds, file texts, whatever you want...) are represented by default by an icon corresponding to the filename
+  <li>Non photo elements (video, sounds, file texts, whatever you want...) are represented by default by an icon corresponding to the filename
   extension. Optionally, you can associate a thumbnail and a representative
   file (see video.avi in the example above).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Warning</em>: the name of directories and files must contain only letters, figures, "-", "_" or ".". No blank space, nor accentuated characters.</li>
 
   <li>Once photos are correctly placed in the
diff --git a/language/uk_UA/help/photos_add_ftp.html b/language/uk_UA/help/photos_add_ftp.html
index 7b1eee230..980efa074 100755
--- a/language/uk_UA/help/photos_add_ftp.html
+++ b/language/uk_UA/help/photos_add_ftp.html
@@ -43,11 +43,20 @@ galleries
     |-- video-from-plane.avi
     +-- pwg_representative
         +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
 
-  <li>За винятком "pwg_representative" (див. пояснення нижче), в кожній директорії в розділі "galleries" виступає як альбом. Немає ніяких обмежень на глибину директорій.</li>

+  <li>За винятком "pwg_representative" and "pwg_format" (див. пояснення нижче), в кожній директорії в розділі "galleries" виступає як альбом. Немає ніяких обмежень на глибину директорій.</li>
 
   <li>В основному, файл представлений елементом. Файл може бути на
 Piwigo елементом, якщо його розширення, серед <code>file_ext</code>
@@ -60,6 +69,8 @@ Piwigo елементом, якщо його розширення, серед <c
 розширення. За бажанням, можна пов'язати мініатюру і представника
 файлу (див. video.avi у наведеному вище прикладі).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Попередження</em>: ім'я директорії і файлів повинне містити тільки листи, фігури, "-", "_" or ".". Без пробілів і акцентованих символів.</li>
 
   <li>Як тільки фотографії правильно розташовані в
diff --git a/language/vi_VN/common.lang.php b/language/vi_VN/common.lang.php
index aa3ccbb1e..1fdaf345c 100644
--- a/language/vi_VN/common.lang.php
+++ b/language/vi_VN/common.lang.php
@@ -426,3 +426,4 @@ $lang['Photo title'] = 'Tiêu đề ảnh';
 $lang['Album name, A &rarr; Z'] = 'Tên album, A &rarr; Z';
 $lang['Album name, Z &rarr; A'] = 'Tên album, Z &rarr; A';
 $lang['Link: %s'] = 'Liên kết: %s';
+$lang['Your authentication key is no longer valid.'] = 'Khóa xác thực của bạn không còn hợp lệ nữa.';
\ No newline at end of file
diff --git a/language/zh_CN/admin.lang.php b/language/zh_CN/admin.lang.php
index 347c48a49..92a4f66fc 100644
--- a/language/zh_CN/admin.lang.php
+++ b/language/zh_CN/admin.lang.php
@@ -669,7 +669,7 @@ $lang['Apply action'] = '执行操作';
 $lang['automatic order'] = '自动排序';
 $lang['Batch Manager'] = '批量管理';
 $lang['Choose an action'] = '选择一项操作';
-$lang['Delete orphan tags'] = '删除未被关联的标签';
+$lang['Delete orphan tags'] = '删除未关联任何图片的标签';
 $lang['delete photo'] = '删除图片';
 $lang['Duplicates'] = '副本';
 $lang['include child albums'] = '包含子相册';
@@ -678,7 +678,7 @@ $lang['No photo in the current set.'] = '当前集合没有图片。';
 $lang['No photo selected, %d photos in current set'] = '没有图片被选中，当前集合中有 %d 张图片';
 $lang['No photo selected, no action possible.'] = '没有图片被选中，不能执行任何操作。';
 $lang['on the %d selected photos'] = '于此 %d 张所选图片';
-$lang['Orphan tags deleted'] = '无关联图片的标签已被删除';
+$lang['Orphan tags deleted'] = '未关联任何图片的标签已被删除';
 $lang['Refresh photo set'] = '刷新图片集';
 $lang['Remove all filters'] = '删除所有过滤器';
 $lang['remove author'] = '删除作者';
@@ -694,7 +694,7 @@ $lang['The whole set'] = '整个集合';
 $lang['Type here the author name'] = '在此输入作者名称';
 $lang['Type here the title'] = '在此输入标题';
 $lang['Week starts on'] = '星期起始于';
-$lang['You have %d orphan tags: %s.'] = '您有 %d 个无关联图片的标签：%s。';
+$lang['You have %d orphan tags: %s.'] = '您有 %d 个未关联任何图片的标签：%s。';
 $lang['Remove from caddie'] = '从标记图片库中移除';
 $lang['Themes which need upgrade'] = '需更新的主题';
 $lang['Languages which need upgrade'] = '需要更新的语言';
@@ -988,3 +988,12 @@ $lang['date & time'] = '日期与时间';
 $lang['file name'] = '文件名';
 $lang['width & height'] = '宽度&高度';
 $lang['Upload in progress'] = '正在上传';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = '每封发出的email中的链接将包含自动生成的唯一验证密钥，有效期 %s。';
+$lang['For security reason, authentication keys do not work for administrators.'] = '出于安全原因，验证密钥对管理员不起作用。';
+$lang['Edit user'] = '编辑用户';
+$lang['No recipient selected'] = '未选择收件人';
+$lang['No user is permitted to see this private album'] = '没有用户被允许查看该非公开相册';
+$lang['Recipients'] = '收件人';
+$lang['Y Repeat'] = 'Y轴平铺';
+$lang['Delete %d orphan photos'] = '删除 %d 没有任何关联的图片';
+$lang['Orphans'] = '没有任何关联';
\ No newline at end of file
diff --git a/language/zh_CN/help/photos_add_ftp.html b/language/zh_CN/help/photos_add_ftp.html
index eb2231ab7..1702be851 100644
--- a/language/zh_CN/help/photos_add_ftp.html
+++ b/language/zh_CN/help/photos_add_ftp.html
@@ -25,38 +25,33 @@
     <p>相册文件夹均放在 Piwigo 的 "galleries" 文件夹里。以下的文件夹树里有一个很小的相册（但使用了很多功能）：</p>
 
     <pre>
-.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- category-1
-|   |   |-- category-1.1
-|   |   |   |-- category-1.1.1
-|   |   |   |   |-- category-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- category-1.1.1.2
-|   |   |   +-- category-1.1.2
-|   |   |-- category-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- category-1.3
-|   +-- category-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool</pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
 
   </li>
   
@@ -70,6 +65,8 @@
 
   <li>非图片元素 (如视频，声频，文本文件，一切你想到的...) 均以文件扩展名的默认图标显示。或者，你可以用一张缩略图来代表这个文件 (参见 video.avi 的例子)。</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>注意</em>: 文件名和文件夹必须以字母、数字、 "-"、 "_" 或者 "." 组成。没有空格，没有特别的符号。</li>
 
   <li>一旦文件、缩略图都放到其正确的位置后，进入 : <span class="pwgScreen">后台管理 &raquo; 工具 &raquo;
@@ -78,19 +75,3 @@
 </ul>
 
 </fieldset>
-<fieldset>
-  <legend>缩略图</legend>
-<ul>
-
-  <li>每个图片必须要有一张缩略图。</li>
-
-  <li>缩略图保存在相册文件夹里名为 "thumbnail" 的子文件夹。缩略图文件名与图片的文件名一致，将会以 <em>TN-</em> 为前缀</li>
-
-  <li><em>建议</em>: 使用外部工具来创建缩略图。</li>
-
-  <li>你可以使用<span class="pwgScreen">后台管理 &raquo; 图片 &raquo; 缩略图</span> 页面来创建缩略图。即使这是不被推荐的（考虑到图片品质，网络服务器资源读取等问题）。</li>
-
-  <li>分配给所有相册文件夹写权限。</li>
-
-</ul>
-</fieldset>
diff --git a/language/zh_TW/help/photos_add_ftp.html b/language/zh_TW/help/photos_add_ftp.html
index 883527605..9042bc848 100755
--- a/language/zh_TW/help/photos_add_ftp.html
+++ b/language/zh_TW/help/photos_add_ftp.html
@@ -43,11 +43,20 @@
     |-- video-from-plane.avi
     +-- pwg_representative
         +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
 
-  <li>Except for "pwg_representative" (see explanations below), each directory under "galleries" produces a album. There is no limit on deepness.</li>
+  <li>Except for "pwg_representative" and "pwg_format" (see explanations below), each directory under "galleries" produces a album. There is no limit on deepness.</li>
 
   <li>Basically, an element is represented by a file. A file can be a
   Piwigo element if its extension is among <code>file_ext</code>
@@ -56,10 +65,12 @@
   be a picture if its extension is among <code>picture_ext</code>
   configuration parameter possibilities.</li>
 
-  <li>No photo elements (video, sounds, file texts, whatever you want...) are represented by default by an icon corresponding to the filename
+  <li>Non photo elements (video, sounds, file texts, whatever you want...) are represented by default by an icon corresponding to the filename
   extension. Optionally, you can associate a thumbnail and a representative
   file (see video.avi in the example above).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>警告</em>: ​​目錄和文件的名稱必須包含字母，數字，“ - ”，“_”或“.”。不能空白，及特殊字符。</li>
 
   <li>一旦照片被放置在正確的
@@ -68,18 +79,3 @@
 
 </ul>
 </fieldset>
-
-
-
-  每個目錄下的“畫廊”除為“pwg_representative”（見下面的說明），<LI>產生一個專輯。有沒有深度的限制。</ LI>
-
-  <LI>基本上，一個元素表示的一個文件。一個文件就可以了
-  Piwigo的元素，如果其擴展名之間的<code> file_ext </代碼>
-  配置參數的可能性（請參閱<跨度
-  類=“文件名”> / config_default.inc.php </ SPAN>文件）。一個文件可以
-  是一個圖片，如果其擴展名之間的<code> picture_ext </代碼>
-  配置參數的可能性。</ LI>
-
-  <LI>沒有照片元素（視頻，聲音，文件文本，無論你想...）默認情況下，文件名對應一個圖標代表
-  擴展名。或者，您可以將一個縮略圖，並代表
-  文件（見video.avi在上面的例子）。</ LI>