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

Conflicts:
	languages/de.php
	languages/en.php
	start.php
	views/default/forms/photos/admin/settings/main.php
	views/default/photos/css.php

7 files changed, 0 insertions, 117 deletions

diff --git a/languages/da.php b/languages/da.php
index c90e8f55d..e2ccd8b2e 100644
--- a/languages/da.php
+++ b/languages/da.php
@@ -56,7 +56,6 @@ $danish = array(
 			'tidypics:admin:instructions' => 'Dette er de centrale Tidypics indstillinger. Tilpas dem til din opsætning og klik derefter på Gem.',

 			'tidypics:settings:image_lib' => "Foto arkiv: ",

 			'tidypics:settings:download_link' => "Vis download-link",

-			'tidypics:settings:tagging' => "Tillad fotolinks",

 			'tidypics:settings:photo_ratings' => "Tillad karakterergivning af foto (kræver plugin af Miguel Montes eller andet kompatibelt plugin)",

 			'tidypics:settings:exif' => "Vis EXIF data",

 			'tidypics:settings:view_count' => "Vis tæller",

@@ -104,22 +103,6 @@ $danish = array(
 			'image:back' => "Forrige",

 			'image:next' => "Næste",

 

-		// tagging

-			'tidypics:taginstruct' => 'Vælg et område på billedet, som du ønsker at linke',

-			'tidypics:deltag_title' => 'Vælg at slette links',

-			'tidypics:finish_tagging' => 'Annuller',

-			'tidypics:tagthisphoto' => 'Tilføj link til foto',

-			'tidypics:deletetag' => 'Slet foto link',

-			'tidypics:actiontag' => 'Link',

-			'tidypics:actiondelete' => 'Slet',

-			'tidypics:actioncancel' => 'Annuller',

-			'tidypics:inthisphoto' => 'Links i billedet',

-			'tidypics:usertag' => "Foto links til medlem %s",

-			'tidypics:phototagging:success' => 'Foto link tilføjet',

-			'tidypics:phototagging:error' => 'Uventet fejl ved linket',

-			'tidypics:deletetag:success' => 'Udvalgte links er blevet fjernet',

-

-

 		//rss

 			'tidypics:posted' => 'Billedet indstilles individuelt:',

 

@@ -137,8 +120,6 @@ $danish = array(
 			'image:river:created:multiple' => "%s added %u photos to album %s",

 			'image:river:item' => "et billede",

 			'image:river:annotate' => "en kommentar til billedet",

-			'image:river:tagged' => "%s tagged %s in the photo %s",

-			'image:river:tagged:unknown' => "%s tagged %s in a photo",

 			'album:river:created' => "%s har tilføjet et nyt album",

 			'album:river:group' => "i gruppen",

 			'album:river:item' => "et album",

diff --git a/languages/de.php b/languages/de.php
index b6817c589..f4b24e10a 100644
--- a/languages/de.php
+++ b/languages/de.php
@@ -64,7 +64,6 @@ $german = array(
 			'tidypics:settings:thumbnail' => "Erzeugung von Vorschaubildern",

 			'tidypics:settings:help' => "Hilfe",

 			'tidypics:settings:download_link' => "Zeige Download-Link",

-			'tidypics:settings:tagging' => "Tagging von Bildern erlauben",

 			'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",

@@ -167,29 +166,6 @@ $german = array(
 			'image:next' => "Nächstes",

 			'image:index' => "%u von %u",

 

-		// tagging

-			'tidypics:taginstruct' => 'Wähle den Bereich auf dem Bild, für das Du ein Tag setzen willst, oder %s.',

-			'tidypics:finish_tagging' => 'Taggen beenden',

-			'tidypics:deltag_title' => 'Wähle die Tags, die gelöscht werden sollen',

-			'tidypics:finish_tagging' => 'Tagging abbrechen',

-			'tidypics:tagthisphoto' => 'Bild taggen',

-			'tidypics:actiontag' => 'Tag setzen',

-			'tidypics:actioncancel' => 'Abbrechen',

-			'tidypics:inthisphoto' => 'Tags in diesem Bild',

-			'tidypics:usertag' => "Bilder mit Tags, die sich auf %s beziehen",

-			'tidypics:phototagging:success' => 'Das Bild wurde getaggt.',

-			'tidypics:phototagging:error' => 'Beim Hinzufügen des Tags ist ein Fehler aufgetreten.',

-

-			'tidypics:phototagging:delete:success' => 'Das Tag wurde entfernt.',

-			'tidypics:phototagging:delete:error' => 'Beim Entfernen des Tags ist ein Fehler aufgetreten.',

-			'tidypics:phototagging:delete:confirm' => 'Dieses Tag entfernen?',

-

-			'tidypics:tag:subject' => "Du wurdest in einem Bild getaggt",

-			'tidypics:tag:body' => "Du wurdest im Bild %s von %s getaggt.

-

-Um das Bild zu sehen, folge diesem Link: %s",

-

-

 		//rss

 			'tidypics:posted' => 'hat ein Bild hinzugefügt:',

 

@@ -208,8 +184,6 @@ Um das Bild zu sehen, folge diesem Link: %s",
 			'image:river:created:multiple' => "%s hat %u Bilder zum Album %s hinzugefügt.",

 			'image:river:item' => "ein Bild",

 			'image:river:annotate' => "einen Kommentar zum Bild",

-			'image:river:tagged' => "%s hat %s im Bild %s getaggt.",

-			'image:river:tagged:unknown' => "%s hat %s in einem Bild getaggt.",

 			'river:create:object:album' => "%s hat das neue Bilderalbum %s hinzugefügt.",

 			'album:river:group' => "in der Gruppe",

 			'album:river:item' => "ein Album",

diff --git a/languages/en.php b/languages/en.php
index 1c40e5e0a..7042d4d98 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -64,7 +64,6 @@ $english = array(
 			'tidypics:settings:thumbnail' => "Thumbnail Creation",
 			'tidypics:settings:help' => "Help",
 			'tidypics:settings:download_link' => "Show download link",
-			'tidypics:settings:tagging' => "Enable photo tagging",
 			'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",
@@ -175,29 +174,6 @@ $english = array(
 			'image:next' => "Next",
 			'image:index' => "%u of %u",
 
-		// tagging
-			'tidypics:taginstruct' => 'Select the area that you want to tag or %s',
-			'tidypics:finish_tagging' => 'Stop tagging',
-			'tidypics:tagthisphoto' => 'Tag this photo',
-			'tidypics:actiontag' => 'Tag',
-			'tidypics:actioncancel' => 'Cancel',
-			'tidypics:inthisphoto' => 'In this photo',
-			'tidypics:usertag' => "Photos tagged with user %s",
-			'tidypics:phototagging:success' => 'Photo tag was successfully added',
-			'tidypics:phototagging:error' => 'Unexpected error occurred during tagging',
-
-			'tidypics:phototagging:delete:success' => 'Photo tag was removed.',
-			'tidypics:phototagging:delete:error' => 'Unexpceted error occurred when removing photo tag.',
-			'tidypics:phototagging:delete:confirm' => 'Remove this tag?',
-
-
-
-			'tidypics:tag:subject' => "You have been tagged in a photo",
-			'tidypics:tag:body' => "You have been tagged in the photo %s by %s.			
-			
-The photo can be viewed here: %s",
-
-
 		//rss
 			'tidypics:posted' => 'posted a photo:',
 
@@ -216,8 +192,6 @@ The photo can be viewed here: %s",
 			'image:river:created:multiple' => "%s added %u photos to the album %s",
 			'image:river:item' => "a photo",
 			'image:river:annotate' => "a comment on the photo",
-			'image:river:tagged' => "%s tagged %s in the photo %s",
-			'image:river:tagged:unknown' => "%s tagged %s in a photo",
 			'river:create:object:album' => "%s created a new photo album %s",
 			'album:river:group' => "in the group",
 			'album:river:item' => "an album",
diff --git a/languages/es.php b/languages/es.php
index 3dacebee8..27bf66786 100644
--- a/languages/es.php
+++ b/languages/es.php
@@ -51,7 +51,6 @@ $spanish = array(
 			'tidypics:admin:instructions' => 'Este es el corazón de las preferencias de Tidypics. Cambialas y luego guardalas.',

 			'tidypics:settings:image_lib' => "Libreria de Imagenes: ",

 			'tidypics:settings:download_link' => "Mostrar vinculo de descarga",

-			'tidypics:settings:tagging' => "Habilitar etiquetas en las fotos",

 			'tidypics:settings:photo_ratings' => "Habilitar ratings de fotos(requiere instalar el e plugin de Miguel Montes o compatible)",

 			'tidypics:settings:exif' => "Mostrar data de EXIF",

 			'tidypics:settings:view_count' => "Ver contador",

@@ -92,22 +91,6 @@ $spanish = array(
 			'image:back' => "Anterior",

 			'image:next' => "Siguiente",

 

-		// tagging

-			'tidypics:taginstruct' => 'Seleccciona el  área que deseas etiquetar',

-			'tidypics:deltag_title' => 'Seleccionas las etiquetas a borrar',

-			'tidypics:finish_tagging' => 'Detener etiquetado',

-			'tidypics:tagthisphoto' => 'Etiquetar esta foto',

-			'tidypics:deletetag' => 'Borrar etiqueta de la foto',

-			'tidypics:actiontag' => 'Etiqueta',

-			'tidypics:actiondelete' => 'Borrar',

-			'tidypics:actioncancel' => 'Cancelar',

-			'tidypics:inthisphoto' => 'En esta foto',

-			'tidypics:usertag' => "Fotos etiquetadas con %s",

-			'tidypics:phototagging:success' => 'La etiqueta de la foto fue añadida exitosamente',

-			'tidypics:phototagging:error' => 'Ocurrió un error inesperado durante el etiquetado',

-			'tidypics:deletetag:success' => 'Las etiquetas seleccionadas fueron borradas exitosamente',

-

-

 		//rss

 			'tidypics:posted' => 'publicar una foto:',

 

@@ -124,7 +107,6 @@ $spanish = array(
 			'image:river:created' => "%s añadio la foto %s al álbum %s",

 			'image:river:item' => "una foto",

 			'image:river:annotate' => "un comentario en la foto",

-			'image:river:tagged' => "fue etiquetada en la foto",

 			'album:river:created' => "%s creo un nuevo álbum de fotos",

 			'album:river:group' => "en el grupo",

 			'album:river:item' => "un álbum",

diff --git a/languages/fr.php b/languages/fr.php
index 1c653daa1..1190e8ef0 100644
--- a/languages/fr.php
+++ b/languages/fr.php
@@ -51,7 +51,6 @@ $french = array(
 	 'tidypics:settings:image_lib'  =>  "Librairie graphique" , 
 	 'tidypics:settings:thumbnail'  =>  "Création des vignettes" , 
 	 'tidypics:settings:download_link'  =>  "Voir le lien de download" , 
-	 'tidypics:settings:tagging'  =>  "Activer les tags sur les photos" , 
 	 'tidypics:settings:photo_ratings'  =>  "Activer les notations des photos (nécessite le rate plugin de Miguel Montes ou compatible)" , 
 	 'tidypics:settings:exif'  =>  "Voir les données EXIF" , 
 	 'tidypics:settings:view_count'  =>  "Voir le compteur" , 
@@ -86,22 +85,9 @@ $french = array(
 	 'image:none'  =>  "Aucune image n'a encore été ajoutée" , 
 	 'image:back'  =>  "Précédent" , 
 	 'image:next'  =>  "Suivant" , 
-	 'tidypics:taginstruct'  =>  "Sélectionnez la zone que vous souhaitez tagger" , 
-	 'tidypics:deltag_title'  =>  "Sélectionnez le tag à supprimer" , 
-	 'tidypics:finish_tagging'  =>  "Arrêter de tagger" , 
-	 'tidypics:tagthisphoto'  =>  "Tagger cette photo" , 
-	 'tidypics:deletetag'  =>  "Supprimer le tag d'une photo" , 
-	 'tidypics:actiontag'  =>  "Tag" , 
 	 'tidypics:actiondelete'  =>  "Supprimer" , 
 	 'tidypics:actioncancel'  =>  "Annuler" , 
 	 'tidypics:inthisphoto'  =>  "Dans cette photo" , 
-	 'tidypics:usertag'  =>  "Photo taggée par %s" , 
-	 'tidypics:phototagging:success'  =>  "La photo a été correctement taggée." , 
-	 'tidypics:phototagging:error'  =>  "Erreur innatendue durant le taggage" , 
-	 'tidypics:deletetag:success'  =>  "Les tags sélectionnés ont correctement été supprimés" , 
-	 'tidypics:tag:subject'  =>  "Vous avez été taggé dans une photo !!!" , 
-	 'tidypics:tag:body'  =>  "Vous avez été taggé dans la photo %s par %s !!!
-La photo peut être consultée ici: %s" , 
 	 'tidypics:posted'  =>  "a posté une photo" , 
 	 'tidypics:widget:albums'  =>  "Albums photo" , 
 	 'tidypics:widget:album_descr'  =>  "Échantillon de vos albums photo" , 
@@ -113,7 +99,6 @@ La photo peut être consultée ici: %s" ,
 	 'image:river:created'  =>  "%s a ajouté la photo %s à l'album %s" , 
 	 'image:river:item'  =>  "une photo" , 
 	 'image:river:annotate'  =>  "commentaire sur la photo" , 
-	 'image:river:tagged'  =>  "a été taggé sur la photo" , 
 	 'album:river:created'  =>  "%s a créé un nouvel album photo" , 
 	 'album:river:group'  =>  "dans le groupe" , 
 	 'album:river:item'  =>  "un album" , 
diff --git a/languages/he.php b/languages/he.php
index 5f232daf6..af425ec49 100644
--- a/languages/he.php
+++ b/languages/he.php
@@ -47,7 +47,6 @@ $hebrew = array(
 	 'tidypics:admin:instructions'  =>  "אלה הגדרות הליבה של Tidypics.  שנה אותן לפי הצורך ולחץ על שמור" , 
 	 'tidypics:settings:image_lib'  =>  "ספריית תמונות:" , 
 	 'tidypics:settings:download_link'  =>  "הצג לינק להורדה" , 
-	 'tidypics:settings:tagging'  =>  "אפשר תיוג תמונות" , 
 	 'tidypics:settings:photo_ratings'  =>  "אפשר דירוג תמונות, דורש תוסף דירוג של Miguel Montes או דומה" , 
 	 'tidypics:settings:exif'  =>  "הצג נתוני EXIF" , 
 	 'tidypics:settings:view_count'  =>  "מונה צפיה" , 
@@ -81,19 +80,9 @@ $hebrew = array(
 	 'image:none'  =>  "טרם נוספו תמונות" , 
 	 'image:back'  =>  "הקודם" , 
 	 'image:next'  =>  "הבא" , 
-	 'tidypics:taginstruct'  =>  "בחר אזור להוספת תג" , 
-	 'tidypics:deltag_title'  =>  "בחר תגים למחיקה" , 
-	 'tidypics:finish_tagging'  =>  "הפסק לתייג" , 
-	 'tidypics:tagthisphoto'  =>  "תייג תמונה זו" , 
-	 'tidypics:deletetag'  =>  "מחק תג תמונה" , 
-	 'tidypics:actiontag'  =>  "תג" , 
 	 'tidypics:actiondelete'  =>  "מחיקה" , 
 	 'tidypics:actioncancel'  =>  "ביטול" , 
 	 'tidypics:inthisphoto'  =>  "בתמונה זו" , 
-	 'tidypics:usertag'  =>  "תמונות המתוייגות במשתמש %s" , 
-	 'tidypics:phototagging:success'  =>  "התג נוסף בהצלחה" , 
-	 'tidypics:phototagging:error'  =>  "אירע שגיאה בתהליך התיוג" , 
-	 'tidypics:deletetag:success'  =>  "התגים נמחקו בהצלחה" , 
 	 'tidypics:posted'  =>  "הוסיף/ה תמונה" , 
 	 'tidypics:widget:albums'  =>  "אלבומי תמונות" , 
 	 'tidypics:widget:album_descr'  =>  "הצג את האלבומים החדשים שלך" , 
diff --git a/languages/it.php b/languages/it.php
index 27a9654a6..6b42fe655 100644
--- a/languages/it.php
+++ b/languages/it.php
@@ -75,8 +75,6 @@ $italian = array(
 			'image:river:created:multiple' => "%s added %u photos to album %s",

 			'image:river:item' => "una immagine",

 			'image:river:annotate' => "a comment on the image",

-			'image:river:tagged' => "%s tagged %s in the photo %s",

-			'image:river:tagged:unknown' => "%s tagged %s in a photo",

 			'album:river:created' => "%s created a new photo album: ",

 			'album:river:item' => "an album",

 			'album:river:annotate' => "un commento nel foto album",