diff options
| author | Sem <sembrestels@riseup.net> | 2012-07-29 04:19:50 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-07-29 04:19:50 +0200 |
| commit | 55bb2b7ed2583683548e314ae13fadde61eb04d6 (patch) | |
| tree | 18aa780112c293ef078b7651a0c7f08ffd6b13da /languages/en.php | |
| parent | 7a9177c9df49d6fc02280df02d6e7f6d52531382 (diff) | |
| parent | 12a88208acec40e190b0729887e28c9d9add26c3 (diff) | |
| download | elgg-55bb2b7ed2583683548e314ae13fadde61eb04d6.tar.gz elgg-55bb2b7ed2583683548e314ae13fadde61eb04d6.tar.bz2 | |
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
Diffstat (limited to 'languages/en.php')
| -rw-r--r-- | languages/en.php | 26 |
1 files changed, 0 insertions, 26 deletions
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", |