aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2011-08-18 15:19:03 +0000
committerplegall <plg@piwigo.org>2011-08-18 15:19:03 +0000
commit27d0c89c337ee5a2281640d0fed68ed26c0a50e1 (patch)
treead6c21054706d7d81cc9fe541107100a51c565da
parent71848746ba06480ed82811df2373faf75e6e563f (diff)
feature 2407 added: display upload limitations before file selection (file
maximum size, maximum dimensions, allowed file types). The maximum dimensions are calculated for GD only (because Imagick and External ImageMagick are not using PHP memory as far as I could find on the web). bug 2408 fixed: change term "old style form" into "browser uploader" and "multiple file form" into "Flash Uploader" (based on WordPress user interface) git-svn-id: http://piwigo.org/svn/trunk@11966 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/include/photos_add_direct_prepare.inc.php53
-rw-r--r--admin/include/uploadify/uploadify.css1
-rw-r--r--admin/themes/default/template/photos_add_direct.tpl31
-rw-r--r--admin/themes/default/theme.css13
-rw-r--r--language/ar_SA/admin.lang.php3
-rw-r--r--language/ca_ES/admin.lang.php3
-rw-r--r--language/cs_CZ/admin.lang.php3
-rw-r--r--language/da_DK/admin.lang.php3
-rw-r--r--language/de_DE/admin.lang.php3
-rw-r--r--language/en_UK/admin.lang.php8
-rw-r--r--language/es_ES/admin.lang.php3
-rw-r--r--language/fa_IR/admin.lang.php3
-rw-r--r--language/fr_CA/admin.lang.php3
-rw-r--r--language/fr_FR/admin.lang.php8
-rw-r--r--language/he_IL/admin.lang.php3
-rw-r--r--language/hr_HR/admin.lang.php3
-rw-r--r--language/hu_HU/admin.lang.php3
-rw-r--r--language/it_IT/admin.lang.php3
-rw-r--r--language/ja_JP/admin.lang.php3
-rw-r--r--language/ka_GE/admin.lang.php3
-rw-r--r--language/lv_LV/admin.lang.php3
-rw-r--r--language/nl_NL/admin.lang.php3
-rw-r--r--language/no_NO/admin.lang.php3
-rw-r--r--language/pl_PL/admin.lang.php3
-rw-r--r--language/pt_PT/admin.lang.php3
-rw-r--r--language/ro_RO/admin.lang.php2
-rw-r--r--language/ru_RU/admin.lang.php3
-rw-r--r--language/sh_RS/admin.lang.php3
-rw-r--r--language/sk_SK/admin.lang.php3
-rw-r--r--language/sr_RS/admin.lang.php3
-rw-r--r--language/sv_SE/admin.lang.php3
-rw-r--r--language/tr_TR/admin.lang.php3
-rw-r--r--language/uk_UA/admin.lang.php2
-rw-r--r--language/vi_VN/admin.lang.php3
-rw-r--r--language/zh_CN/admin.lang.php3
-rw-r--r--language/zh_TW/admin.lang.php3
36 files changed, 95 insertions, 107 deletions
diff --git a/admin/include/photos_add_direct_prepare.inc.php b/admin/include/photos_add_direct_prepare.inc.php
index 2cfb2f55c..34a5f79b7 100644
--- a/admin/include/photos_add_direct_prepare.inc.php
+++ b/admin/include/photos_add_direct_prepare.inc.php
@@ -55,17 +55,51 @@ if (isset($page['thumbnails']))
$uploadify_path = PHPWG_ROOT_PATH.'admin/include/uploadify';
+$upload_max_filesize = min(
+ get_ini_size('upload_max_filesize'),
+ get_ini_size('post_max_size')
+ );
+
+if ($upload_max_filesize == get_ini_size('upload_max_filesize'))
+{
+ $upload_max_filesize_shorthand = get_ini_size('upload_max_filesize', false);
+}
+else
+{
+ $upload_max_filesize_shorthand = get_ini_size('post_max_filesize', false);
+}
+
$template->assign(
array(
'F_ADD_ACTION'=> PHOTOS_ADD_BASE_URL,
'uploadify_path' => $uploadify_path,
- 'upload_max_filesize' => min(
- get_ini_size('upload_max_filesize'),
- get_ini_size('post_max_size')
- ),
+ 'upload_max_filesize' => $upload_max_filesize,
+ 'upload_max_filesize_shorthand' => $upload_max_filesize_shorthand,
)
);
+// what is the maximum number of pixels permitted by the memory_limit?
+if (pwg_image::get_library() == 'gd')
+{
+ $fudge_factor = 1.7;
+ $available_memory = get_ini_size('memory_limit') - memory_get_usage();
+ $max_upload_width = round(sqrt($available_memory/(2 * $fudge_factor)));
+ $max_upload_height = round(2 * $max_upload_width / 3);
+ $max_upload_resolution = floor($max_upload_width * $max_upload_height / (1024 * 1024));
+
+ // no need to display a limitation warning if the limitation is huge like 20MP
+ if ($max_upload_resolution < 25)
+ {
+ $template->assign(
+ array(
+ 'max_upload_width' => $max_upload_width,
+ 'max_upload_height' => $max_upload_height,
+ 'max_upload_resolution' => $max_upload_resolution,
+ )
+ );
+ }
+}
+
$upload_modes = array('html', 'multiple');
$upload_mode = isset($conf['upload_mode']) ? $conf['upload_mode'] : 'multiple';
@@ -92,6 +126,17 @@ $template->assign(
)
);
+$upload_file_types = 'jpeg, png, gif';
+if ('html' == $upload_mode)
+{
+ $upload_file_types.= ', zip';
+}
+$template->assign(
+ array(
+ 'upload_file_types' => $upload_file_types,
+ )
+ );
+
// +-----------------------------------------------------------------------+
// | Categories |
// +-----------------------------------------------------------------------+
diff --git a/admin/include/uploadify/uploadify.css b/admin/include/uploadify/uploadify.css
index 334837a95..9a94cb8eb 100644
--- a/admin/include/uploadify/uploadify.css
+++ b/admin/include/uploadify/uploadify.css
@@ -26,7 +26,6 @@ THE SOFTWARE.
width: 420px;
max-height: 300px;
overflow: auto;
- border: 1px solid #333;
margin: 0 auto 10px auto;
padding: 5px 0 10px 0;
}
diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl
index 7f17663f8..9ee4a8595 100644
--- a/admin/themes/default/template/photos_add_direct.tpl
+++ b/admin/themes/default/template/photos_add_direct.tpl
@@ -142,6 +142,11 @@ jQuery(document).ready(function(){
return false;
});
+ jQuery("#uploadWarningsSummary a.showInfo").click(function() {
+ jQuery("#uploadWarningsSummary").hide();
+ jQuery("#uploadWarnings").show();
+ });
+
{/literal}
{if $upload_mode eq 'html'}
{literal}
@@ -186,6 +191,9 @@ var sizeLimit = {$upload_max_filesize};
'fileDesc' : 'Photo files (*.jpg,*.jpeg,*.png)',
'fileExt' : '*.jpg;*.JPG;*.jpeg;*.JPEG;*.png;*.PNG',
'sizeLimit' : sizeLimit,
+ 'onSelect' : function(event,ID,fileObj) {
+ jQuery("#fileQueue").show();
+ },
'onAllComplete' : function(event, data) {
if (data.errors) {
return false;
@@ -337,7 +345,7 @@ var sizeLimit = {$upload_max_filesize};
</div>
<p id="batchLink"><a href="{$batch_link}">{$batch_label}</a></p>
</fieldset>
-<p><a href="{$another_upload_link}">{'Add another set of photos'|@translate}</a></p>
+<p style="margin:10px"><a href="{$another_upload_link}">{'Add another set of photos'|@translate}</a></p>
{else}
<div id="formErrors" class="errors" style="display:none">
@@ -388,29 +396,38 @@ var sizeLimit = {$upload_max_filesize};
<fieldset>
<legend>{'Select files'|@translate}</legend>
-{if $upload_mode eq 'html'}
- <p><a href="{$switch_url}">{'... or switch to the multiple files form'|@translate}</a></p>
+ <p id="uploadWarningsSummary">{$upload_max_filesize_shorthand}B. {$upload_file_types}. {if isset($max_upload_resolution)}{$max_upload_resolution}Mpx{/if} <a class="showInfo" title="{'Learn more'|@translate}">i</a></p>
- <p>{'JPEG files or ZIP archives with JPEG files inside please.'|@translate}</p>
+ <p id="uploadWarnings">
+{'Maximum file size: %sB.'|@translate|@sprintf:$upload_max_filesize_shorthand}
+{'Allowed file types: %s.'|@translate|@sprintf:$upload_file_types}
+ {if isset($max_upload_resolution)}
+{'Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'|@translate|@sprintf:$max_upload_resolution:$max_upload_width:$max_upload_height}
+ {/if}
+ </p>
+{if $upload_mode eq 'html'}
<div id="uploadBoxes"></div>
<div id="addUploadBox">
<a href="javascript:">{'+ Add an upload box'|@translate}</a>
</div>
+
+ <p id="uploadModeInfos">{'You are using the Browser uploader. Try the <a href="%s">Flash uploader</a> instead.'|@translate|@sprintf:$switch_url}</p>
</fieldset>
<p>
- <input class="submit" type="submit" name="submit_upload" value="{'Upload'|@translate}">
+ <input class="submit" type="submit" name="submit_upload" value="{'Start Upload'|@translate}">
</p>
{elseif $upload_mode eq 'multiple'}
+
<p>
<input type="file" name="uploadify" id="uploadify">
</p>
- <p><a href="{$switch_url}">{'... or switch to the old style form'|@translate}</a></p>
+ <div id="fileQueue" style="display:none"></div>
- <div id="fileQueue"></div>
+ <p id="uploadModeInfos">{'You are using the Flash uploader. Problems? Try the <a href="%s">Browser uploader</a> instead.'|@translate|@sprintf:$switch_url}</p>
</fieldset>
<p>
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index ad99e20ce..ff99ff8f7 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -922,6 +922,7 @@ h2:lang(en) { text-transform:capitalize; }
.pluginActions {display: table-row; font-size:0.95em; color:#777;}
.pluginActions DIV {display: table-cell; vertical-align: middle; line-height:18px; }
.showInfo {display:block;position:absolute;top:0;right:5px;width:15px;font-style:italic;font-family:"Georgia",serif;background-color:#464646;font-size:0.9em;border-radius:10px;-moz-border-radius:10px;}
+.showInfo:hover {cursor:pointer}
.warning:before {content:url(icon/warning.png);vertical-align:top;}
.deactivate_all {text-align:right;font-size:0.95em;}
@@ -1058,4 +1059,14 @@ div.token-input-dropdown ul li.token-input-selected-dropdown-item {background-co
#mainConfCheck span.property span.filter:first-child a.removeFilter {display:none;} /* can't delete the first field */
#mainConfCheck span.filter {display:block;margin-left:20px;}
#mainConfCheck .transparent {opacity:0.5;filter:alpha(opacity=50);}
-#mainConfCheck .order_by_is_custom {display:block;font-weight:normal;font-style:italic;margin-left:20px;} \ No newline at end of file
+#mainConfCheck .order_by_is_custom {display:block;font-weight:normal;font-style:italic;margin-left:20px;}
+
+/* Upload Form */
+#uploadBoxes .file {margin-bottom:5px;text-align:left;}
+#uploadBoxes {margin-top:20px;}
+#addUploadBox {margin-bottom:2em;}
+
+p#uploadWarningsSummary {text-align:left;margin-bottom:1em;font-size:90%;color:#999;}
+p#uploadWarningsSummary .showInfo {position:static;display:inline;padding:1px 6px;margin-left:3px;}
+p#uploadWarnings {display:none;text-align:left;margin-bottom:1em;font-size:90%;color:#999;}
+p#uploadModeInfos {text-align:left;margin-top:1em;font-size:90%;color:#999;} \ No newline at end of file
diff --git a/language/ar_SA/admin.lang.php b/language/ar_SA/admin.lang.php
index 142e32363..b04245686 100644
--- a/language/ar_SA/admin.lang.php
+++ b/language/ar_SA/admin.lang.php
@@ -619,12 +619,9 @@ $lang['Privacy level set to "%s"'] = '"%s"اعد مستوى الخصوصية ';
$lang['Album "%s" now contains %d photos'] = ' الألبوم "%s" يحوي الآن %d صورة ';
$lang['Manage this set of %d photos'] = '%d إدارة اعدادت صور';
$lang['Select files'] = 'اختيار الملفات';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'ملفات صور JPEG النقطيبة و ملفات مضغوطةZIP فقط';
$lang['Everybody'] = 'الجميع';
$lang['Who can see these photos?'] = 'من يمكنه رؤية هذه الصور';
$lang['Who can see this photo?'] = 'من يمكنه رؤية هذه الصورة؟';
-$lang['... or switch to the old style form'] = '... أو اظهر الواجهة القديمة ';
-$lang['... or switch to the multiple files form'] = '... أو التحول إلى شكل ملفات متعددة';
$lang['The websize maximum width must be a number between %d and %d'] = '%d و %d الحد الأعلى لعرض صورة الويب يجب أن تكون';
$lang['The websize maximum height must be a number between %d and %d'] = '%d و %d الحد الأعلى لطول صورة الويب يجب أن تكون بين ';
$lang['The websize image quality must be a number between %d and %d'] = '%d و %d جودة صورة الوب يجب أن تكون بين ';
diff --git a/language/ca_ES/admin.lang.php b/language/ca_ES/admin.lang.php
index af9cea3d9..a5e45d3ae 100644
--- a/language/ca_ES/admin.lang.php
+++ b/language/ca_ES/admin.lang.php
@@ -620,8 +620,6 @@ $lang['Order of menubar items has been updated successfully.'] = 'L\'ordre dels
$lang['%d of %d photos selected'] = '%d de %d fotos seleccionades';
$lang['%d photos uploaded'] = '%d fotos penjades';
$lang['+ Add an upload box'] = '+ Afegeix un quadre de càrrega';
-$lang['... or switch to the multiple files form'] = '... o canvia pel formulari de fitxers múltiples';
-$lang['... or switch to the old style form'] = '... o canvia pel formulari d\'estil antic';
$lang['Action'] = 'Acció';
$lang['Activate field "%s"'] = 'Afegeix camp "%s"';
$lang['Activate icon "%s"'] = 'Activa la icona "%s"';
@@ -688,7 +686,6 @@ $lang['include child albums'] = 'include child albums';
$lang['Install on your computer,'] = 'Install on your computer,';
$lang['Installed Languages'] = 'Installed Languages';
$lang['Invert'] = 'Invert';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG files or ZIP archives with JPEG files inside please.';
$lang['Keep high definition'] = 'Keep high definition';
$lang['Language has been successfully installed'] = 'Language has been successfully installed';
$lang['Languages'] = 'Languages';
diff --git a/language/cs_CZ/admin.lang.php b/language/cs_CZ/admin.lang.php
index 7ec1588e3..ed93d92b0 100644
--- a/language/cs_CZ/admin.lang.php
+++ b/language/cs_CZ/admin.lang.php
@@ -592,7 +592,6 @@ $lang['Privacy level set to "%s"'] = 'Uroveň soukromí údajú nastaven na "%s"
$lang['Album "%s" now contains %d photos'] = 'Kategorie "%s" nyní obsahuje %d fotografií';
$lang['Manage this set of %d photos'] = 'Spravovat tento soubor %d fotografií';
$lang['Select files'] = 'Výběr souborů';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG soubory nebo ZIP archivy s JPEG soubory prosím.';
$lang['Operation in progress'] = 'Provádím údržbu.';
$lang['Please wait...'] = 'Prosím počkejte...';
$lang['Piwigo Announcements Newsletter'] = 'Piwigo Zpravodaj';
@@ -623,8 +622,6 @@ $lang['Everybody'] = 'Každý';
$lang['Who can see these photos?'] = 'Kdo může vidět tyto fotografie?';
$lang['Who can see this photo?'] = 'Kdo může vidět tuto fotografii?';
$lang['Pending Comments'] = 'Nevyřízené komentáře';
-$lang['... or switch to the old style form'] = '... nebo přepněte na původní styl';
-$lang['... or switch to the multiple files form'] = '... nebo přepněte na formát vícenásobných souborů';
$lang['The websize maximum width must be a number between %d and %d'] = 'Maximální šířka webovské stránky musí být číslo mezi %d a %d';
$lang['The websize maximum height must be a number between %d and %d'] = 'Maximální výška webovské stránky musí být číslo mezi %d a %d';
$lang['The websize image quality must be a number between %d and %d'] = 'Kvalita formátu fotografie pro web musí být číslo mezi %d and %d';
diff --git a/language/da_DK/admin.lang.php b/language/da_DK/admin.lang.php
index 0d0c1e417..44526cae7 100644
--- a/language/da_DK/admin.lang.php
+++ b/language/da_DK/admin.lang.php
@@ -616,11 +616,8 @@ $lang['Privacy level set to "%s"'] = 'Privat niveau sat til \'%s\'';
$lang['Album "%s" now contains %d photos'] = 'Kategori \'%s\'indeholder nu %d billeder ';
$lang['Manage this set of %d photos'] = 'Administrer dette sæt af %d billeder ';
$lang['Select files'] = 'Vælg filer';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG-filer eller ZIP arkiver med JPEG-filer inde tak. ';
$lang['Everybody'] = 'Alle';
$lang['Who can see these photos?'] = 'Hvem kan se disse billeder? ';
-$lang['... or switch to the old style form'] = '... eller skifte til den gamle stil form ';
-$lang['... or switch to the multiple files form'] = '... eller skifte til flere filer form';
$lang['The websize maximum width must be a number between %d and %d'] = 'Det websize maksimale bredde skal være et tal mellem %d og %d ';
$lang['The websize maximum height must be a number between %d and %d'] = 'Det websize maksimale højde skal være et nummer mellem %d og %d ';
$lang['The websize image quality must be a number between %d and %d'] = 'De websize billedkvaliteten skal være et nummer mellem %d og %d ';
diff --git a/language/de_DE/admin.lang.php b/language/de_DE/admin.lang.php
index deae3afbf..85e92ca10 100644
--- a/language/de_DE/admin.lang.php
+++ b/language/de_DE/admin.lang.php
@@ -617,12 +617,9 @@ $lang['Privacy level set to "%s"'] = 'Datenschutzstufe auf "%s" gesetzt';
$lang['Album "%s" now contains %d photos'] = 'Das Album "%s" enthält nun %d Fotos';
$lang['Manage this set of %d photos'] = 'Verwalte dieses Set von %d Fotos';
$lang['Select files'] = 'Wähle Dateien aus';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG Dateien oder ZIP Archive, die JPEG Dateien enthalten bitte.';
$lang['Everybody'] = 'Jedermann';
$lang['Who can see these photos?'] = 'Wer soll die Fotos sehen können?';
$lang['Who can see this photo?'] = 'Wer soll dieses Foto sehen können?';
-$lang['... or switch to the old style form'] = '... oder schalte um auf das alte Formular';
-$lang['... or switch to the multiple files form'] = '... oder schalte um auf Mehrfachauswahl';
$lang['The websize maximum width must be a number between %d and %d'] = 'Die maximale Breite muss eine Zahl zwischen %d und %d sein';
$lang['The websize maximum height must be a number between %d and %d'] = 'Die maximale Höhe muss eine Zahl zwischen %d und %d sein';
$lang['The websize image quality must be a number between %d and %d'] = 'Die Bildqualität muss eine Zahl zwischen %d und %d sein';
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index fdca61475..5bb1493cf 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -79,8 +79,6 @@ $lang['%s must be to set to false in your local/config/config.inc.php file'] = "
$lang['%s value is not correct file because exif are not supported'] = "%s value is incorrect because exif are not supported";
$lang['+ Add an upload box'] = '+ Add an upload box';
$lang[', click on'] = ", click on";
-$lang['... or switch to the multiple files form'] = '... or switch to the multiple files form';
-$lang['... or switch to the old style form'] = '... or switch to the old style form';
$lang['A local listing.xml file has been found for'] = "A local listing.xml file has been found for";
$lang['A new version of Piwigo is available.'] = "A new version of Piwigo is available.";
$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the album directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = "a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory \"thumbnail\" of the album directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :";
@@ -364,7 +362,6 @@ $lang['Installed Themes'] = "Installed Themes";
$lang['Instructions to use Piwigo'] = "Instructions to use Piwigo";
$lang['Invert'] = 'Invert';
$lang['IP'] = "IP";
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG files or ZIP archives with JPEG files inside please.';
$lang['jump to album'] = "jump to album";
$lang['jump to photo'] = "jump to photo";
$lang['Keep high definition'] = 'Keep high definition';
@@ -846,4 +843,9 @@ $lang['Graphics Library'] = 'Graphics Library';
$lang['... or '] = '... or ';
$lang['Create'] = 'Create';
$lang['Start Upload'] = 'Start Upload';
+$lang['You are using the Flash uploader. Problems? Try the <a href="%s">Browser uploader</a> instead.'] = 'You are using the Flash uploader. Problems? Try the <a href="%s">Browser uploader</a> instead.';
+$lang['You are using the Browser uploader. Try the <a href="%s">Flash uploader</a> instead.'] = 'You are using the Browser uploader. Try the <a href="%s">Flash uploader</a> instead.';
+$lang['Maximum file size: %sB.'] = 'Maximum file size: %sB.';
+$lang['Allowed file types: %s.'] = 'Allowed file types: %s.';
+$lang['Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'] = 'Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).';
?>
diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php
index fc16e6799..89b555814 100644
--- a/language/es_ES/admin.lang.php
+++ b/language/es_ES/admin.lang.php
@@ -615,11 +615,8 @@ $lang['Privacy level set to "%s"'] = 'Nivel de confidencialidad "%s"';
$lang['Album "%s" now contains %d photos'] = 'EL àlbum "%s" ahora lleva %d fotos';
$lang['Manage this set of %d photos'] = 'Administrar este lote de %d fotos';
$lang['Select files'] = 'Escoger ficheros';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'Ficheros JPEG o archivas ZIP que contiene ficheros JPEG por favor.';
$lang['Everybody'] = 'Todo el mundo';
$lang['Who can see these photos?'] = '¿ Quién puede ver estas fotos?';
-$lang['... or switch to the old style form'] = '... o utilizar el antiguo formulario';
-$lang['... or switch to the multiple files form'] = '... o utilizar el formulario multificheros';
$lang['The websize maximum width must be a number between %d and %d'] = 'La ancho máxima para la medidas de las fotos debe ser una cifra comprendida entra %d y %d';
$lang['The websize maximum height must be a number between %d and %d'] = 'La altura máxima para la medidas de las fotos debe ser una cifra comprendida entra %d y %d';
$lang['The websize image quality must be a number between %d and %d'] = 'La calidad de imagen para la medidas de las fotos debe ser una cifra comprendida entra %d y %d';
diff --git a/language/fa_IR/admin.lang.php b/language/fa_IR/admin.lang.php
index a04e499f8..2606f4c17 100644
--- a/language/fa_IR/admin.lang.php
+++ b/language/fa_IR/admin.lang.php
@@ -618,12 +618,9 @@ $lang['Privacy level set to "%s"'] = 'Privacy level set to "%s"';
$lang['Album "%s" now contains %d photos'] = 'دسته "%s" شامل %d تصویر است';
$lang['Manage this set of %d photos'] = 'Manage this set of %d photos';
$lang['Select files'] = 'انتخاب فایل‌ها';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'فایل‌های JPEG یا آرشیو ZIP که دارای فایل JPEG است را وارد نمایید';
$lang['Everybody'] = 'همه';
$lang['Who can see these photos?'] = 'چه کسی قادر به مشاهده این تصاویر باشد؟';
$lang['Who can see this photo?'] = 'چه کسی قادر به مشاهده این تصویر باشد';
-$lang['... or switch to the old style form'] = 'تعویض به فرم آپلود قدیمی...';
-$lang['... or switch to the multiple files form'] = 'تعویض به حالت جدید ....';
$lang['The websize maximum width must be a number between %d and %d'] = 'حداکثر عرض برای تصویر پیش‌فرض باید عددی بین %d و %d باشد';
$lang['The websize maximum height must be a number between %d and %d'] = 'حداکثر طول تصویر پیش‌فرض باید عددی بین %d و %d باشد';
$lang['The websize image quality must be a number between %d and %d'] = 'حداکثر کیفین تصویر پیش‌فرض باید عددی بین %d و %d باشد';
diff --git a/language/fr_CA/admin.lang.php b/language/fr_CA/admin.lang.php
index 797621397..71de88cfd 100644
--- a/language/fr_CA/admin.lang.php
+++ b/language/fr_CA/admin.lang.php
@@ -626,12 +626,9 @@ $lang['Privacy level set to "%s"'] = 'Niveau de confidentialité "%s"';
$lang['Album "%s" now contains %d photos'] = 'La catégorie "%s" contient désormais %d photos';
$lang['Manage this set of %d photos'] = 'Gérer ce lot de %d photos';
$lang['Select files'] = 'Choisir des fichiers';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'Fichiers JPEG ou archives ZIP contenant des fichiers JPEG s\'il vous plaît.';
$lang['Everybody'] = 'Tout le monde';
$lang['Who can see these photos?'] = 'Qui peut voir ces photos ?';
$lang['Who can see this photo?'] = 'Qui peut voir cette photo ?';
-$lang['... or switch to the old style form'] = '... ou utiliser le formulaire "à l\'ancienne"';
-$lang['... or switch to the multiple files form'] = '... ou utiliser le formulaire multi-fichiers';
$lang['The websize maximum width must be a number between %d and %d'] = 'La largeur maximum pour la photo taille web doit être un chiffre compris entre %d et %d';
$lang['The websize maximum height must be a number between %d and %d'] = 'La hauteur maximum pour la photo taille web doit être un chiffre compris entre %d et %d';
$lang['The websize image quality must be a number between %d and %d'] = 'La qualité d\'image pour la photo taille web doit être un chiffre compris entre %d et %d';
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 65312b680..2a695ab8e 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -621,12 +621,9 @@ $lang['Privacy level set to "%s"'] = 'Niveau de confidentialité "%s"';
$lang['Album "%s" now contains %d photos'] = 'l\'album "%s" contient désormais %d photos';
$lang['Manage this set of %d photos'] = 'Gérer ce lot de %d photos';
$lang['Select files'] = 'Choisir des fichiers';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'Fichiers JPEG ou archives ZIP contenant des fichiers JPEG s\'il vous plaît.';
$lang['Everybody'] = 'Tout le monde';
$lang['Who can see these photos?'] = 'Qui peut voir ces photos ?';
$lang['Who can see this photo?'] = 'Qui peut voir cette photo ?';
-$lang['... or switch to the old style form'] = '... ou utiliser le formulaire "à l\'ancienne"';
-$lang['... or switch to the multiple files form'] = '... ou utiliser le formulaire multi-fichiers';
$lang['The websize maximum width must be a number between %d and %d'] = 'La largeur maximum pour la photo taille web doit être un chiffre compris entre %d et %d';
$lang['The websize maximum height must be a number between %d and %d'] = 'La hauteur maximum pour la photo taille web doit être un chiffre compris entre %d et %d';
@@ -855,4 +852,9 @@ $lang['Add a criteria'] = 'Ajouter un critère';
$lang['... or '] = '... ou bien ';
$lang['Create'] = 'Créer';
$lang['Start Upload'] = 'Démarrer le transfert';
+$lang['You are using the Flash uploader. Problems? Try the <a href="%s">Browser uploader</a> instead.'] = 'Vous utilisez le formulaire Flash. Des problèmes ? Essayez le <a href="%s">formulaire HTML</a> à la place.';
+$lang['You are using the Browser uploader. Try the <a href="%s">Flash uploader</a> instead.'] = 'Vous utilisez le formulaire HTML. Essayez le <a href="%s">formulaire Flash</a> à la place.';
+$lang['Maximum file size: %sB.'] = 'Poids maximum des fichiers : %sB.';
+$lang['Allowed file types: %s.'] = 'Types de fichiers autorisés : %s.';
+$lang['Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'] = 'Résolution maximum approximative : %dM pixels (soit %dx%d pixels).';
?> \ No newline at end of file
diff --git a/language/he_IL/admin.lang.php b/language/he_IL/admin.lang.php
index 0bcde4e1b..08e605be3 100644
--- a/language/he_IL/admin.lang.php
+++ b/language/he_IL/admin.lang.php
@@ -615,12 +615,9 @@ $lang['Privacy level set to "%s"'] = 'רמת פרטיות מוגדרת ל "%s"';
$lang['Album "%s" now contains %d photos'] = 'הקטגוריה "%s" מכילה כעט %d תמונות';
$lang['Manage this set of %d photos'] = 'נהל את קבוצת התמונות הזאת (%d תמונות)';
$lang['Select files'] = 'בחר קבצים';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'קבצי JPEG או בארכיון ZIP עם קבצי JPEG בתוך בבקשה.';
$lang['Everybody'] = 'כולם';
$lang['Who can see these photos?'] = 'מי יכול לראות את התמונות?';
$lang['Who can see this photo?'] = 'מי יכול לראות את התמונה?';
-$lang['... or switch to the old style form'] = '... או לעבור בצורה בסגנון הישן ';
-$lang['... or switch to the multiple files form'] = '... או לעבור בצורת קבצים מרובים ';
$lang['The websize maximum width must be a number between %d and %d'] = 'רוחב מרבי websize חייב להיות מספר בין% d% d ';
$lang['The websize maximum height must be a number between %d and %d'] = 'הגובה המרבי של האתר חייב להיות מספר בין %d ו %d';
$lang['The websize image quality must be a number between %d and %d'] = 'איכות התמונה באתר חייב להיות מספר בין %d ו %d';
diff --git a/language/hr_HR/admin.lang.php b/language/hr_HR/admin.lang.php
index ad9896d27..474b39e81 100644
--- a/language/hr_HR/admin.lang.php
+++ b/language/hr_HR/admin.lang.php
@@ -615,11 +615,8 @@ $lang['Privacy level set to "%s"'] = 'Razina privatnosti postavljena na "%s"';
$lang['Album "%s" now contains %d photos'] = 'Skupina "%s" sada sadržava %d slika';
$lang['Manage this set of %d photos'] = 'Upravljanje ovim skupom od %d slika';
$lang['Select files'] = 'Odaberi zapise';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG zapisi ili ZIP arhive sa JPEG zapisima unutra molim.';
$lang['Everybody'] = 'Svi';
$lang['Who can see these photos?'] = 'Tko može pregledavati ove slike?';
-$lang['... or switch to the old style form'] = '... ili prebaci na oblik starog stila';
-$lang['... or switch to the multiple files form'] = '... ili prebaci na oblik višestrukih zapisa';
$lang['The websize maximum width must be a number between %d and %d'] = 'Najveća širina web prozora mora biti broj između %d i %d';
$lang['The websize maximum height must be a number between %d and %d'] = 'Najveća visina web prozora mora biti broj između %d i %d';
$lang['The websize image quality must be a number between %d and %d'] = 'Kakvoća slike u web prozoru mora biti broj između %d i %d';
diff --git a/language/hu_HU/admin.lang.php b/language/hu_HU/admin.lang.php
index b89bb8318..ad1542033 100644
--- a/language/hu_HU/admin.lang.php
+++ b/language/hu_HU/admin.lang.php
@@ -603,11 +603,8 @@ $lang['Privacy level set to "%s"'] = 'Minimum hozzáférési szint itt: "%s"';
$lang['Album "%s" now contains %d photos'] = '\'%s\' albumban már %d kép található';
$lang['Manage this set of %d photos'] = 'Szerkessze a készlet (%d elem) képeit';
$lang['Select files'] = 'Képek kiválasztása';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG kiterjesztésű képeket, vagy JPEG képeket tartalmazó ZIP archivumot kérek.';
$lang['Everybody'] = 'Mindenki';
$lang['Who can see these photos?'] = 'Ki láthatja a képeket?';
-$lang['... or switch to the old style form'] = '... vagy váltson át a hagyományos feltöltésre';
-$lang['... or switch to the multiple files form'] = '... vagy váltson át flash alapú feltöltésre';
$lang['The websize maximum width must be a number between %d and %d'] = 'Meg kell adni a kép legnagyobb szélességét pixelben %d és %d között';
$lang['The websize maximum height must be a number between %d and %d'] = 'Meg kell adni a kép legnagyobb magasságát pixelben %d és %d között';
$lang['The websize image quality must be a number between %d and %d'] = 'Meg kell adni a kép minőségét %d és %d között';
diff --git a/language/it_IT/admin.lang.php b/language/it_IT/admin.lang.php
index 1589d35c9..1cf2955a5 100644
--- a/language/it_IT/admin.lang.php
+++ b/language/it_IT/admin.lang.php
@@ -621,12 +621,9 @@ $lang['Privacy level set to "%s"'] = 'Livello di privacy "%s"';
$lang['Album "%s" now contains %d photos'] = 'L\'Album "%s" contiene adesso %d foto';
$lang['Manage this set of %d photos'] = 'Gestire questo set di %d foto';
$lang['Select files'] = 'Scegliere i file';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'File JPEG o archivi ZIP con dentro dei file JPEG per cortesia.';
$lang['Everybody'] = 'Tutti';
$lang['Who can see these photos?'] = 'Chi può vedere queste foto?';
$lang['Who can see this photo?'] = 'Chi può vedere questa foto?';
-$lang['... or switch to the old style form'] = '... o passare sul modulo "vecchio stile"';
-$lang['... or switch to the multiple files form'] = '... o passare sul modulo multi-file';
$lang['The websize maximum width must be a number between %d and %d'] = 'La larghezza massima della foto con dimenzioni per il web deve essere un numero tra %d e %d';
$lang['The websize maximum height must be a number between %d and %d'] = 'L\'altezza massima della foto con dimenzioni per il web deve essere un numero tra %d e %d';
diff --git a/language/ja_JP/admin.lang.php b/language/ja_JP/admin.lang.php
index 28e698491..05a30613a 100644
--- a/language/ja_JP/admin.lang.php
+++ b/language/ja_JP/admin.lang.php
@@ -619,11 +619,8 @@ $lang['Privacy level set to "%s"'] = 'プライバシー設定: "%s"';
$lang['Album "%s" now contains %d photos'] = 'カテゴリー "%s" は現在 %d 枚の写真があります。';
$lang['Manage this set of %d photos'] = ' %d 枚の写真を管理する';
$lang['Select files'] = 'ファイルを選択する';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEGファイル又は、ZIPファイルフォーマットに入っているJPEGファイル下さい。';
$lang['Everybody'] = '全員';
$lang['Who can see these photos?'] = 'どなたがこの写真を見られますか?';
-$lang['... or switch to the old style form'] = '... 又は、旧形式に変更する';
-$lang['... or switch to the multiple files form'] = '... 又は、複数ファイル式に変更する';
$lang['The websize maximum width must be a number between %d and %d'] = 'ウェッブサイズの最大幅は %d と %dの中に設定する必要があります。';
$lang['The websize maximum height must be a number between %d and %d'] = 'ウェッブサイズの最大の高さは%d と %dの中に設定する必要があります。';
$lang['The websize image quality must be a number between %d and %d'] = 'ウェッブサイズの画質は%d と %d の中に設定する必要があります。';
diff --git a/language/ka_GE/admin.lang.php b/language/ka_GE/admin.lang.php
index 28aa3696c..ed57e8bc6 100644
--- a/language/ka_GE/admin.lang.php
+++ b/language/ka_GE/admin.lang.php
@@ -625,11 +625,8 @@ $lang['Privacy level set to "%s"'] = 'დავაყენოთ დაშვ
$lang['Album "%s" now contains %d photos'] = 'კატეგორია "%s" შეიცავს ამჟამად %d ფოტოს';
$lang['Manage this set of %d photos'] = 'ამ კრებულის რედაქტირება, შემცველობით %d Fოტო';
$lang['Select files'] = 'ავირჩიოთ ფაილები';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG ფაილები ან ZIP არქივი JPEG ფაილებით შიგნით.';
$lang['Everybody'] = 'ყველა';
$lang['Who can see these photos?'] = 'ვის შეუძლია ნახოს ეს ფოტოები?';
-$lang['... or switch to the old style form'] = '... ან გადართეთ ფორმის ძველ სახეზე';
-$lang['... or switch to the multiple files form'] = '... ან გადართეთ მულტი ატვირთვის ფორმაზე';
$lang['The websize maximum width must be a number between %d and %d'] = 'ფოტოს მაქსიმალური სიგანე უნდა იყოს რიცხვი %d და %d შორის';
$lang['The websize maximum height must be a number between %d and %d'] = 'ფოტოს მაქსიმალური სიმაღლე უნდა იყოს რიცხვი %d და %d შორის';
$lang['The websize image quality must be a number between %d and %d'] = 'ფოტოს ხარისხი უნდა იყოს რიცხვით %d და %d შორის';
diff --git a/language/lv_LV/admin.lang.php b/language/lv_LV/admin.lang.php
index 234a62335..4cb23134a 100644
--- a/language/lv_LV/admin.lang.php
+++ b/language/lv_LV/admin.lang.php
@@ -611,12 +611,9 @@ $lang['Privacy level set to "%s"'] = 'Iestatīt piekļuves līmeni "%s"';
$lang['Album "%s" now contains %d photos'] = 'Kategorijā "%s" ir %d attēli';
$lang['Manage this set of %d photos'] = 'Rediģēt šo %d attēlu kopumu.';
$lang['Select files'] = 'Izvēlēties failus';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'Lūdzu JPEG failus vai ZIP arhīvus no JPEG failiem.';
$lang['Everybody'] = 'Visi';
$lang['Who can see these photos?'] = 'Kas var skatīties šos attēlus?';
$lang['Who can see this photo?'] = 'Kas var skatīties šo attēlu?';
-$lang['... or switch to the old style form'] = '... vai lietojiet vecā stila formu';
-$lang['... or switch to the multiple files form'] = '... vai lietojiet multiielādes formu';
$lang['The websize maximum width must be a number between %d and %d'] = 'Maksimālajam attēla platumam jābūt skaitlim starp %d and %d';
$lang['The websize maximum height must be a number between %d and %d'] = 'Maksimālajam attēla augstumam jābūt skaitlim starp %d and %d';
$lang['The websize image quality must be a number between %d and %d'] = 'Attēla kvalitātei jābūt skaitlim starp %d and %d';
diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php
index a269d651a..d844de1c1 100644
--- a/language/nl_NL/admin.lang.php
+++ b/language/nl_NL/admin.lang.php
@@ -615,11 +615,8 @@ $lang['Privacy level set to "%s"'] = 'Privacy-niveau staat nu op "%s"';
$lang['Album "%s" now contains %d photos'] = 'Categorie "%s" bevat nu %d foto\'s';
$lang['Manage this set of %d photos'] = 'Beheer deze reeks van %d foto\'s';
$lang['Select files'] = 'Selecteer bestanden';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG bestanden of ZIP bestanden die JPEG bestanden bevatten aub.';
$lang['Everybody'] = 'Iedereen';
$lang['Who can see these photos?'] = 'Wie mag deze foto\'s zien?';
-$lang['... or switch to the old style form'] = '... of schakel om naar het oude-stijl formulier';
-$lang['... or switch to the multiple files form'] = '... of schakel om naar het meervoudige bestanden formulier';
$lang['The websize maximum width must be a number between %d and %d'] = 'De webgrootte maximum breedte moet liggen tussen %d en %d';
$lang['The websize maximum height must be a number between %d and %d'] = 'De webgrootte maximum hoogte moet liggen tussen %d en %d';
$lang['The websize image quality must be a number between %d and %d'] = 'De webgrootte afbeeldingskwaliteit moet liggen tussen %d en %d';
diff --git a/language/no_NO/admin.lang.php b/language/no_NO/admin.lang.php
index 736d07b9f..9574cb75b 100644
--- a/language/no_NO/admin.lang.php
+++ b/language/no_NO/admin.lang.php
@@ -611,12 +611,9 @@ $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['Select files'] = 'Velg filer';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG filer eller ZIP arkiv med JPEG filer inni.';
$lang['Everybody'] = 'Alle';
$lang['Who can see these photos?'] = 'Hvem kan se disse bildene?';
$lang['Who can see this photo?'] = 'Hvem kan se dette bildet?';
-$lang['... or switch to the old style form'] = '... eller bytt til gammel stil format';
-$lang['... or switch to the multiple files form'] = '... eller bytt til flere filer format';
$lang['The websize maximum width must be a number between %d and %d'] = 'Websidens maksimums bredde må være et nummer mellom %d og %d';
$lang['The websize maximum height must be a number between %d and %d'] = 'Websidens maksimums høyde må være et nummer mellom %d og %d';
$lang['The websize image quality must be a number between %d and %d'] = 'Websidens bilde kvalitet må være et nummer mellom %d og %d';
diff --git a/language/pl_PL/admin.lang.php b/language/pl_PL/admin.lang.php
index 15a9eada7..c3b65d253 100644
--- a/language/pl_PL/admin.lang.php
+++ b/language/pl_PL/admin.lang.php
@@ -619,11 +619,8 @@ $lang['Privacy level set to "%s"'] = 'Poziom prywatności ustawiony na "%s"';
$lang['Album "%s" now contains %d photos'] = 'Kategoria "%s" aktualnie zawiera %d zdjęć';
$lang['Manage this set of %d photos'] = 'Zarządzaj tym zbiorem %d zdjęć';
$lang['Select files'] = 'Wybierz pliki';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'Pliki JPEG lub archiwa ZIP z plikami JPEG w środku.';
$lang['Everybody'] = 'Każdy';
$lang['Who can see these photos?'] = 'Kto może oglądać te zdjęcia?';
-$lang['... or switch to the old style form'] = '... lub przełącz do starego stylu formularza';
-$lang['... or switch to the multiple files form'] = '... lub przełącz do formularza wielu plików';
$lang['The websize maximum width must be a number between %d and %d'] = 'Maksymalna szerokość dla www musi być liczbą pomiędzy %d i %d';
$lang['The websize maximum height must be a number between %d and %d'] = 'Maksymalna wysokość dla www musi być liczbą pomiędzy %d i %d';
$lang['The websize image quality must be a number between %d and %d'] = 'Maksymalna jakość obrazu dla www musi być liczbą pomiędzy %d i %d';
diff --git a/language/pt_PT/admin.lang.php b/language/pt_PT/admin.lang.php
index 6b9f281c4..ef25eadfc 100644
--- a/language/pt_PT/admin.lang.php
+++ b/language/pt_PT/admin.lang.php
@@ -586,8 +586,6 @@ $lang['Menu Management'] = 'Menú';
$lang['%d of %d photos selected'] = '%d de %d fotos seleccionadas';
$lang['%d photos uploaded'] = '%d fotos enviadas';
$lang['+ Add an upload box'] = '+ Adicionar uma caixa de envio';
-$lang['... or switch to the multiple files form'] = '... ou mudar para o formulário de ficheiros múltiplos';
-$lang['... or switch to the old style form'] = '... ou mudar para o formulário antigo';
$lang['Action'] = 'Acção';
$lang['Activate field "%s"'] = 'Activar campo "%s"';
$lang['Activate icon "%s"'] = 'Activar ícone "%s"';
@@ -665,7 +663,6 @@ $lang['Installed Languages'] = 'Linguagens Instaladas';
$lang['Installed Themes'] = 'Temas Instalados';
$lang['Instructions to use Piwigo'] = 'Instruções para usar Piwigo';
$lang['Invert'] = 'Inverter';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'Ficheiros JPEG ou ficheiros ZIP com ficheiros JPEG dentro, por favor.';
$lang['Keep high definition'] = 'Manter Alta Definição';
$lang['Language has been successfully installed'] = 'Linguagem instalada com sucesso';
$lang['Languages'] = 'Linguagens';
diff --git a/language/ro_RO/admin.lang.php b/language/ro_RO/admin.lang.php
index 154ec564b..ee41c4d39 100644
--- a/language/ro_RO/admin.lang.php
+++ b/language/ro_RO/admin.lang.php
@@ -262,8 +262,6 @@ $lang['%s must be to set to false in your local/config/config.inc.php file'] = '
$lang['%s value is not correct file because exif are not supported'] = '%s valoare este incorectă, deoarece exif-urile nu sunt suportate';
$lang['+ Add an upload box'] = '+ Adauga o cutie de încărcare';
$lang[', click on'] = ', apasă pe';
-$lang['... or switch to the multiple files form'] = '... sau schimbă în formularul pentru fişiere multiple';
-$lang['... or switch to the old style form'] = '... sau schimbă în formularul în stilul vechi';
$lang['A local listing.xml file has been found for'] = 'A fost găsit un fişier listing.xml local pentru';
$lang['A new version of Piwigo is available.'] = 'O nouă versiune a lui Piwigo este disponibilă.';
$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the album directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'un tip de fişier de fotografie necesită o previzualizare. Previzualizarea trebuie să existe în sub-directorul "thumbnail" din directorul albumului. Previzualizarea trebuie să înceapă cu prefixul configurat pentru previzualizări şi extensia trebuie să facă parte din lista următoare :';
diff --git a/language/ru_RU/admin.lang.php b/language/ru_RU/admin.lang.php
index 111004ff4..fdc43ab3e 100644
--- a/language/ru_RU/admin.lang.php
+++ b/language/ru_RU/admin.lang.php
@@ -615,11 +615,8 @@ $lang['Privacy level set to "%s"'] = 'Установить уровень дос
$lang['Album "%s" now contains %d photos'] = 'Категория "%s" содержит сейчас %d фотографий';
$lang['Manage this set of %d photos'] = 'Редактировать этот набор из %d фотографий';
$lang['Select files'] = 'Выбрать файлы';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG файлы или ZIP архивы с JPEG файлами внутри, пожалуйста.';
$lang['Everybody'] = 'Все';
$lang['Who can see these photos?'] = 'Кто может смотреть эти фотографии?';
-$lang['... or switch to the old style form'] = '... или переключитесь на старый вид формы';
-$lang['... or switch to the multiple files form'] = '... или переключитесь на форму мультизагрузки';
$lang['The websize maximum width must be a number between %d and %d'] = 'Максимальная ширина изображения должна быть числом между %d и %d';
$lang['The websize maximum height must be a number between %d and %d'] = 'Максимальная высота изображения должна быть числом между %d и %d';
$lang['The websize image quality must be a number between %d and %d'] = 'Качество изображения должно быть числом между %d и%d';
diff --git a/language/sh_RS/admin.lang.php b/language/sh_RS/admin.lang.php
index bce1639b7..bf70ab145 100644
--- a/language/sh_RS/admin.lang.php
+++ b/language/sh_RS/admin.lang.php
@@ -618,11 +618,8 @@ $lang['Privacy level set to "%s"'] = 'Nivo privatnosti podešen na "%s"';
$lang['Album "%s" now contains %d photos'] = 'Kategorija "%s" sada sadrži %d fotografija';
$lang['Manage this set of %d photos'] = 'Uredi ovaj set %d fotografija';
$lang['Select files'] = 'Izaberi datoteke';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG datoteke ili ZIP arhive sa JPEG datotekama u sebi molim.';
$lang['Everybody'] = 'Svi';
$lang['Who can see these photos?'] = 'Ko može da vidi fotografije?';
-$lang['... or switch to the old style form'] = '... ili promeni na stari stil obrazac';
-$lang['... or switch to the multiple files form'] = '...ili promeni na višestruke datoteke obrazac';
$lang['The websize maximum width must be a number between %d and %d'] = 'Maksimalna širina fotografije mora biti broj između %d i %d';
$lang['The websize maximum height must be a number between %d and %d'] = 'Maksimalna visina fotografije mora biti broj između %d i %d';
$lang['The websize image quality must be a number between %d and %d'] = 'Kvalitet fotografije mora biti broj između %d i %d';
diff --git a/language/sk_SK/admin.lang.php b/language/sk_SK/admin.lang.php
index cc971d535..97b48e31b 100644
--- a/language/sk_SK/admin.lang.php
+++ b/language/sk_SK/admin.lang.php
@@ -590,7 +590,6 @@ $lang['Privacy level set to "%s"'] = 'Úroveň súkromia údajov nastavená na "
$lang['Album "%s" now contains %d photos'] = 'Kategória "%s" teraz obsahuje %d fotografií';
$lang['Manage this set of %d photos'] = 'Spravovať tento súbor %d fotografií';
$lang['Select files'] = 'Výber súborov';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG súbory alebo ZIP archívy s JPEG súbormi prosím.';
// missing translations 2.1.0
$lang['Operation in progress'] = 'Prevádzam údržbu.';
@@ -623,8 +622,6 @@ $lang['Everybody'] = 'Každý';
$lang['Who can see these photos?'] = 'Kto môže vidieť tieto fotografie?';
$lang['Who can see this photo?'] = 'Kto môže vidieť túto fotografiu?';
$lang['Pending Comments'] = 'Nevybavené komentáre';
-$lang['... or switch to the old style form'] = '... alebo prepnite na pôvodné štýly';
-$lang['... or switch to the multiple files form'] = '... alebo prepnite na formát viacnásobných súborov';
$lang['The websize maximum width must be a number between %d and %d'] = 'Maximálna šírka webovej stránky musí byť číslo medzi %d a %d';
$lang['The websize maximum height must be a number between %d and %d'] = 'Maximálna výška webovej stránky musí byť číslo medzi %d a %d';
$lang['The websize image quality must be a number between %d and %d'] = 'Kvalita formátu fotografie pre web musí byť číslo medzi %d and %d';
diff --git a/language/sr_RS/admin.lang.php b/language/sr_RS/admin.lang.php
index f428cd6b1..0292186ff 100644
--- a/language/sr_RS/admin.lang.php
+++ b/language/sr_RS/admin.lang.php
@@ -618,11 +618,8 @@ $lang['Privacy level set to "%s"'] = 'Ниво приватности подеш
$lang['Album "%s" now contains %d photos'] = 'Категорија "%s" сада садржи %d фотографија';
$lang['Manage this set of %d photos'] = 'Уреди овај сет %d фотографија';
$lang['Select files'] = 'Изабери датотеке';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG датотеке или ZIP архиве са JPEG датотекама у себи молим.';
$lang['Everybody'] = 'Сви';
$lang['Who can see these photos?'] = 'Ко може да види фотографије?';
-$lang['... or switch to the old style form'] = '... или промени на стари стил образац';
-$lang['... or switch to the multiple files form'] = '...или промени на вишеструке датотеке образац';
$lang['The websize maximum width must be a number between %d and %d'] = 'Максимална ширина фотографије мора бити број између %d и %d';
$lang['The websize maximum height must be a number between %d and %d'] = 'Максимална висина фотографије мора бити број између %d и %d';
$lang['The websize image quality must be a number between %d and %d'] = 'Квалитет фотографије мора бити број између %d и %d';
diff --git a/language/sv_SE/admin.lang.php b/language/sv_SE/admin.lang.php
index a55c9bb3a..6a1b3cec1 100644
--- a/language/sv_SE/admin.lang.php
+++ b/language/sv_SE/admin.lang.php
@@ -612,13 +612,10 @@ $lang['Privacy level set to "%s"'] = 'Sekretessnivå inställd på "%s"';
$lang['Album "%s" now contains %d photos'] = 'Kategir "%s" innehåller nu %d foton';
$lang['Manage this set of %d photos'] = 'Hantera settet om %d foton';
$lang['Select files'] = 'Markerade filer';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG filer eller ZIP arkiv med JPEG filer innuti tack.';
$lang['Everybody'] = 'Alla';
$lang['Who can see these photos?'] = 'Vem kan se dessa foton?';
$lang['Who can see this photo?'] = 'Vem kan se detta foto?';
-$lang['... or switch to the old style form'] = '... eller byt till gamla versionen av formuläret';
-$lang['... or switch to the multiple files form'] = '... eller byt till formuläret för att ladda upp många bilder';
$lang['The websize maximum width must be a number between %d and %d'] = 'Webstorlekens maximala bredd måste vara ett nummer mellan %d och %d';
$lang['The websize maximum height must be a number between %d and %d'] = 'Webstorlekens maximala höjd måste vara ett nummer mellan %d och %d';
diff --git a/language/tr_TR/admin.lang.php b/language/tr_TR/admin.lang.php
index d2f8ad373..f3b235977 100644
--- a/language/tr_TR/admin.lang.php
+++ b/language/tr_TR/admin.lang.php
@@ -611,12 +611,9 @@ $lang['Privacy level set to "%s"'] = 'Gizlilik seviyesi "%s" için';
$lang['Album "%s" now contains %d photos'] = 'kategori "%s" şimdi %d resimlerini içeriyor';
$lang['Manage this set of %d photos'] = 'Düzenle bu dizi %d resimleri';
$lang['Select files'] = 'Dosyaları seçin';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG dosyaları ya da ZIP arşivleri içinde JPEG dosyaları olan.';
$lang['Everybody'] = 'Herkes';
$lang['Who can see these photos?'] = 'Kim bu resimleri görebilir?';
$lang['Who can see this photo?'] = 'Kim bu resimi görebilir?';
-$lang['... or switch to the old style form'] = '... veya eski stil form geç';
-$lang['... or switch to the multiple files form'] = '... veya birden fazla dosya geçiş formu';
$lang['The websize maximum width must be a number between %d and %d'] = 'En fazla genişlik %d ve %d sayıları arasında olmalı';
$lang['The websize maximum height must be a number between %d and %d'] = 'En fazla yükseklik %d be %d sayıları arasında olmalı';
$lang['The websize image quality must be a number between %d and %d'] = 'Resim kalitesi %d ve %d sayıları arasında olmalı';
diff --git a/language/uk_UA/admin.lang.php b/language/uk_UA/admin.lang.php
index 615577db3..8182c9c78 100644
--- a/language/uk_UA/admin.lang.php
+++ b/language/uk_UA/admin.lang.php
@@ -94,8 +94,6 @@ $lang['%s must be to set to false in your local/config/config.inc.php file'] = '
$lang['%s value is not correct file because exif are not supported'] = '%s значення некоректне, оскільки EXIF не підтримуються';
$lang['+ Add an upload box'] = '+ Додати вікно завантаження';
$lang[', click on'] = ', натисніть на';
-$lang['... or switch to the multiple files form'] = '... або переключитися на форму завантаження кількох файлів';
-$lang['... or switch to the old style form'] = '... або переключитися на старий стиль форми';
$lang['A local listing.xml file has been found for'] = 'Знайдено локальний файл listing.xml для';
$lang['A new version of Piwigo is available.'] = 'Доступна нова версія Piwigo.';
$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the album directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = 'тип файлу зображення вимагає завантаження мініатюри. Мініатюри повинні бути в під-каталозі "thumbnail" каталогу альбому. Назва файлу мініатюри повинна починатись з конфігураційного префікса мініатюри, а розширення повинно бути одним із наступних :';
diff --git a/language/vi_VN/admin.lang.php b/language/vi_VN/admin.lang.php
index 1c62314fb..69fd31bd7 100644
--- a/language/vi_VN/admin.lang.php
+++ b/language/vi_VN/admin.lang.php
@@ -620,12 +620,9 @@ $lang['Privacy level set to "%s"'] = 'Mức độ riêng tư đã được thi
$lang['Album "%s" now contains %d photos'] = 'Đề mục "%s" hiện tại chứa %d bức ảnh';
$lang['Manage this set of %d photos'] = 'Quản lý bộ gồm %d ảnh';
$lang['Select files'] = 'Chọn tệp tin';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'Chỉ chấp nhận tệp tin JPEG hoặc định dạng lưu trữ ZIP chứa tệp JPEG bên trong.';
$lang['Everybody'] = 'Mọi người';
$lang['Who can see these photos?'] = 'Ai có thể xem được những bức ảnh này?';
$lang['Who can see this photo?'] = 'Ai có thể xem được bức ảnh này?';
-$lang['... or switch to the old style form'] = '... hoặc chuyển sang fomr kiểu cũ';
-$lang['... or switch to the multiple files form'] = '... hoặc chuyển sang fomr kiểu đa tệp tin';
$lang['The websize maximum width must be a number between %d and %d'] = 'Chiều rộng lớn nhất của trang web phải là số nằm giữa %d và %d';
$lang['The websize maximum height must be a number between %d and %d'] = 'Chiều cao lớn nhất của trang web phải là số nằm giữa %d và %d';
$lang['The websize image quality must be a number between %d and %d'] = 'Chất lượng hình của trang web phải là số nằm giữa %d và %d';
diff --git a/language/zh_CN/admin.lang.php b/language/zh_CN/admin.lang.php
index 999431c2d..59d7ff87f 100644
--- a/language/zh_CN/admin.lang.php
+++ b/language/zh_CN/admin.lang.php
@@ -610,11 +610,8 @@ $lang['Privacy level set to "%s"'] = '私有级别设置为 "%s"';
$lang['Album "%s" now contains %d photos'] = '类别 "%s" 现已包含了 %d 相片';
$lang['Manage this set of %d photos'] = '管理此设置的 %d 张照片 ';
$lang['Select files'] = '选择文件';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG 文件或者将 JPEG 文件放到一个 ZIP 档案里';
$lang['Everybody'] = '每个人';
$lang['Who can see these photos?'] = '哪些人可以看到这些相片?';
-$lang['... or switch to the old style form'] = '... 或者使用旧式的表单';
-$lang['... or switch to the multiple files form'] = '... 或者使用多文件上传表单';
$lang['The websize maximum width must be a number between %d and %d'] = '最大宽度的网页尺寸必须在 %d 和 %d 之间';
$lang['The websize maximum height must be a number between %d and %d'] = '最大高度的网页尺寸必须在 %d 和 %d 之间';
$lang['The websize image quality must be a number between %d and %d'] = '图片质量的网页尺寸必须在 %d 和 %d 之间';
diff --git a/language/zh_TW/admin.lang.php b/language/zh_TW/admin.lang.php
index 93941ec06..e9a0a96bf 100644
--- a/language/zh_TW/admin.lang.php
+++ b/language/zh_TW/admin.lang.php
@@ -610,11 +610,8 @@ $lang['Privacy level set to "%s"'] = '私有級別設置為 "%s"';
$lang['Album "%s" now contains %d photos'] = '類別 "%s" 現已包含了 %d 相片';
$lang['Manage this set of %d photos'] = '管理此設置的 %d 張照片 ';
$lang['Select files'] = '選擇文件';
-$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG 文件或者將 JPEG 文件放到一個 ZIP 檔案裡';
$lang['Everybody'] = '每個人';
$lang['Who can see these photos?'] = '哪些人可以看到這些相片?';
-$lang['... or switch to the old style form'] = '... 或者使用舊式的表單';
-$lang['... or switch to the multiple files form'] = '... 或者使用多文件上傳表單';
$lang['The websize maximum width must be a number between %d and %d'] = '最大寬度的網頁尺寸必須在 %d 和 %d 之間';
$lang['The websize maximum height must be a number between %d and %d'] = '最大高度的網頁尺寸必須在 %d 和 %d 之間';
$lang['The websize image quality must be a number between %d and %d'] = '圖片質量的網頁尺寸必須在 %d 和 %d 之間';