Merge branch 'no-flash-uploader' of git://github.com/sembrestels/Tidypics

6 files changed, 2 insertions, 10 deletions

diff --git a/languages/da.php b/languages/da.php
index 78113d467..c90e8f55d 100644
--- a/languages/da.php
+++ b/languages/da.php
@@ -92,7 +92,6 @@ $danish = array(
 			'tidypics:uploader:choose' => "Vælg fotos",

 			'tidypics:uploader:upload' => "Upload fotos",

 			'tidypics:uploader:describe' => "Beskriv fotos",

-			'tidypics:uploader:instructs' => 'Med tre nemme trin kan du tilføje fotos i dit album ved hjælp af denne uploader: vælg, upload og beskriv fotos. Hvis du ikke har Flash, er der også en <a href="%s">standard uploader</a> til rådighed.',

 			'tidypics:uploader:basic' => 'Du kan uploade op til 10 fotos ad gangen (%s MB maksimum pr. foto)',

 			'tidypics:sort:instruct' => 'Sortér fotos i albummet ved hjælp af drag and drop. Klik derefter på knappen Gem.',

 	

diff --git a/languages/de.php b/languages/de.php
index 1f439e981..b6817c589 100644
--- a/languages/de.php
+++ b/languages/de.php
@@ -68,7 +68,6 @@ $german = array(
 			'tidypics:settings:photo_ratings' => "Bewerten von Bildern erlauben (benötigt das Elggx Fivestar-Plugin oder ein vergleichbares)",

 			'tidypics:settings:exif' => "EXIF-Daten anzeigen",

 			'tidypics:settings:view_count' => "Zugriffszähler anzeigen",

-			'tidypics:settings:uploader' => "Flash-Uploader verwenden",

 			'tidypics:settings:grp_perm_override' => "Gruppen-Mitgliedern unbeschränkten Zugriff auf die Verwaltung von Gruppen-Alben geben",

 			'tidypics:settings:maxfilesize' => "Maximal erlaubte Bildgröße in Megabytes (MB):",

 			'tidypics:settings:quota' => "Quota für Benutzer in Megabytes (MB) (0 = kein Quota)",

@@ -101,8 +100,7 @@ $german = array(
 			'tidypics:server_info:post_max_size_desc' => '"Max post size" abzüglich der Größe der HTML-Form = Maximal mögliche Gesamtgröße von gleichzeitig hochzuladenden Bildern.',

 			'tidypics:server_info:max_input_time_desc' => 'Maximale erlaubte Dauer, in der das Hochladen von Daten auf den Server abgeschlossen sein muss.',

 			'tidypics:server_info:max_execution_time_desc' => 'Maximal erlaubte Ausführdauer für ein Skript auf dem Server.',

-			'tidypics:server_info:use_only_cookies_desc' => 'Cookie only sessions können den Flash-Uploader beeinträchtigen.',

-

+			

 			'tidypics:server_info:php_version' => 'PHP-Version',

 			'tidypics:server_info:memory_limit' => 'Für PHP verfügbarer Speicher',

 			'tidypics:server_info:peak_usage' => 'Genutzer Speicher, um diese Seite zu laden',

diff --git a/languages/en.php b/languages/en.php
index 62b43673d..1c40e5e0a 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -68,7 +68,6 @@ $english = array(
 			'tidypics:settings:photo_ratings' => "Enable photo ratings (requires rate plugin of Miguel Montes or compatible)",
 			'tidypics:settings:exif' => "Display EXIF data",
 			'tidypics:settings:view_count' => "Display view count",
-			'tidypics:settings:uploader' => "Use Flash uploader",
 			'tidypics:settings:grp_perm_override' => "Allow group members full access to group albums",
 			'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):",
 			'tidypics:settings:quota' => "User Quota (MB) - 0 equals no quota",
@@ -101,8 +100,7 @@ $english = array(
 			'tidypics:server_info:post_max_size_desc' => 'Max post size = sum of images + html form',
 			'tidypics:server_info:max_input_time_desc' => 'Time script waits for upload to finish',
 			'tidypics:server_info:max_execution_time_desc' => 'Max time a script will run',
-			'tidypics:server_info:use_only_cookies_desc' => 'Cookie only sessions may affect the Flash uploader',
-
+			
 			'tidypics:server_info:php_version' => 'PHP Version',
 			'tidypics:server_info:memory_limit' => 'Memory Available to PHP',
 			'tidypics:server_info:peak_usage' => 'Memory Used to Load This Page',
diff --git a/languages/es.php b/languages/es.php
index e99997234..3dacebee8 100644
--- a/languages/es.php
+++ b/languages/es.php
@@ -11,7 +11,6 @@ $spanish = array(
 			'caption' => "T&iacute;tulo",

 			'photos' => "Fotos",

 			'images:upload' => "Cargar Imagenes",

-			'images:multiupload' => "Herramienta MultiCarga de Flash",

 			'images:multiupload:todo' => "Selecciona uno a m&aacute;s archivos para cargar..",

 			'album' => "&Aacute;lbum de Fotos",

 			'albums' => "&Aacute;lbumnes de Fotos",

diff --git a/languages/fr.php b/languages/fr.php
index 375159e0b..1c653daa1 100644
--- a/languages/fr.php
+++ b/languages/fr.php
@@ -9,7 +9,6 @@ $french = array(
 	 'caption'  =>  "Légende" , 
 	 'photos'  =>  "Photos" , 
 	 'images:upload'  =>  "Charger des images" , 
-	 'images:multiupload'  =>  "Outil Flash de chargement multi fichiers" , 
 	 'images:multiupload:todo'  =>  "Sélectionnez un ou plusieurs fichiers à charger." , 
 	 'album'  =>  "Album photo" , 
 	 'albums'  =>  "Albums photo" , 
diff --git a/languages/it.php b/languages/it.php
index 764ecf5f7..27a9654a6 100644
--- a/languages/it.php
+++ b/languages/it.php
@@ -51,7 +51,6 @@ $italian = array(
 			'tidypics:uploader:choose' => "Scegli le Foto",

 			'tidypics:uploader:upload' => "Carica le Foto",

 			'tidypics:uploader:describe' => "Descrivi le Foto",

-			'tidypics:uploader:instructs' => 'Ci sono tre semplici passaggi per aggiungere le Foto al tuo Album usando questo caricatore: la scelta, il caricamento e il descriverle. Se non hai Flash, è disponibile anche un <a href="%s">caricatore di base</a>.',

 			'tidypics:uploader:basic' => 'Puoi caricare fino a 10 Foto alla volta (%s MB massimo per foto)',

 			'tidypics:sort:instruct' => 'Ordina i Foto Album trascinando le immagini. Poi clicca il bottone salva.',