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

6 files changed, 0 insertions, 6 deletions

diff --git a/languages/da.php b/languages/da.php
index e2ccd8b2e..3e454540c 100644
--- a/languages/da.php
+++ b/languages/da.php
@@ -62,7 +62,6 @@ $danish = array(
 			'tidypics:settings:grp_perm_override' => "Giv gruppens medlemmer fuld adgang til gruppe-album",

 			'tidypics:settings:maxfilesize' => "Maksimal billedstørrelse i megabytes (MB):",

 			'tidypics:settings:quota' => "Tildelt plads til brugere / grupper (MB) (0 = Ingen plads)",

-			'tidypics:settings:watermark' => "Indtast teksten for vandmærke - ImageMagick cmdline skal vælges for billedbiblioteket",

 			'tidypics:settings:im_path' => "Angiv stien til ImageMagick kommandoer (som slutter med et Slash/)",

 			'tidypics:settings:img_river_view' => "Hvor mange poster i aktivitetslisten for hvert parti af uploadede billeder",

 			'tidypics:settings:album_river_view' => "Vis albumcover eller et sæt af fotos til nye album",

diff --git a/languages/de.php b/languages/de.php
index f4b24e10a..67763d622 100644
--- a/languages/de.php
+++ b/languages/de.php
@@ -70,7 +70,6 @@ $german = array(
 			'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)",

-			'tidypics:settings:watermark' => "Gib den Text ein, der als Wasserzeichen eingefügt wird",

 			'tidypics:settings:im_path' => "Der Pfad zu den ImageMagick-Kommandozeilentools auf dem Server",

 			'tidypics:settings:img_river_view' => "Anzahl der Einträge im River beim gleichzeitigen Hochladen mehrerer Bilder",

 			'tidypics:settings:album_river_view' => "Anzeige des Albumcovers oder eines Sets von Bildern für neue Alben",

diff --git a/languages/en.php b/languages/en.php
index 7042d4d98..32174e278 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -70,7 +70,6 @@ $english = array(
 			'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",
-			'tidypics:settings:watermark' => "Enter text to appear in the watermark",
 			'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands",
 			'tidypics:settings:img_river_view' => "How many entries in activity river for each batch of uploaded images",
 			'tidypics:settings:album_river_view' => "Show the album cover or a set of photos for new album",
diff --git a/languages/es.php b/languages/es.php
index 27bf66786..154d7188a 100644
--- a/languages/es.php
+++ b/languages/es.php
@@ -57,7 +57,6 @@ $spanish = array(
 			'tidypics:settings:grp_perm_override' => "Permitir acceso completo a los miembros de este grupo al album de fotos",

 			'tidypics:settings:maxfilesize' => "Tamaño máximo de la imagen en megabytes (MB):",

 			'tidypics:settings:quota' => "Usuario/Grupo Cuota (MB) - 0 MB de cuota",

-			'tidypics:settings:watermark' => "Introduce el texto que aparecerá en la marca de agua - ImageMagick Cmdline debe ser seleccionado para la libreria de imagenes",

 			'tidypics:settings:im_path' => "Ingresa la ruta de tu ImageMagick commands (incluye el slash)",

 			'tidypics:settings:img_river_view' => "¿Cuántas entradas deseas para cada grupo de imágenes cargadas?",

 			'tidypics:settings:album_river_view' => "Muestra la portada del álbum o el set de fotos para el álbum nuevo",

diff --git a/languages/fr.php b/languages/fr.php
index 1190e8ef0..0b9ceac49 100644
--- a/languages/fr.php
+++ b/languages/fr.php
@@ -57,7 +57,6 @@ $french = array(
 	 'tidypics:settings:grp_perm_override'  =>  "Autoriser l'acés total aux membres du groupe" , 
 	 'tidypics:settings:maxfilesize'  =>  "Taille maximum des images  en Mb:" , 
 	 'tidypics:settings:quota'  =>  "Quota Utilisateur/Groupe (Mb) - O égal pas de quota" , 
-	 'tidypics:settings:watermark'  =>  "Entrez le texte qui doit figure sur le WaterMark - fonction non vraiment sure." , 
 	 'tidypics:settings:im_path'  =>  "Chemin de l'exécutable ImageMagick, terminé par un slash" , 
 	 'tidypics:settings:img_river_view'  =>  "Combien d'entrées dans le river pour chaque lot de traitement des fichiers chargés" , 
 	 'tidypics:settings:album_river_view'  =>  "Montrer la couverture de l'album ou un ensemble de photos pour tout nouvel album" , 
diff --git a/languages/he.php b/languages/he.php
index af425ec49..d2a2bb9ab 100644
--- a/languages/he.php
+++ b/languages/he.php
@@ -53,7 +53,6 @@ $hebrew = array(
 	 'tidypics:settings:grp_perm_override'  =>  "אפשר לחברי קבוצה גישה מלאה לאלבומים קבוצתיים" , 
 	 'tidypics:settings:maxfilesize'  =>  "גודל תמונה מירבי בMB" , 
 	 'tidypics:settings:quota'  =>  "מכסה בMB למשתמש/קבוצה - 0 שווה ללא מכסה" , 
-	 'tidypics:settings:watermark'  =>  "הזן טקסט אשר יופיע בסימן המים - יש לבחור ב ImageMagick Cmdline עבור ספריית התמונות" , 
 	 'tidypics:settings:im_path'  =>  "הזן את הנטיב לפקודות ImageMagick ללא לוכסן בסוף" , 
 	 'tidypics:settings:img_river_view'  =>  "כמה רשומות במה חדש עבור כל מקבץ תמונות אשר נוסף" , 
 	 'tidypics:settings:album_river_view'  =>  "הצג תמונה אחת או מקבץ תמונות עבור אלבום חדש" ,