Skip to content

Commit

Permalink
Merge branch 'master' into activesync_2_9_0
Browse files Browse the repository at this point in the history 
Conflicts:
	framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php
	framework/ActiveSync/package.xml
  • Loading branch information
@mrubinsk
mrubinsk committed Oct 16, 2013
2 parents 5b5d834 + 31f639c commit bbd2344
Show file tree
Hide file tree
Showing 104 changed files with 12,656 additions and 10,071 deletions.
64 changes: 32 additions & 32 deletions ansel/locale/ansel.pot
View file
Expand Up @@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Ansel H5 (3.0.0-git)\n"
"Project-Id-Version: Ansel H5 (3.0.1-git)\n"
"Report-Msgid-Bugs-To: dev@lists.horde.org\n"
"POT-Creation-Date: 2013-07-16 21:24+0200\n"
"POT-Creation-Date: 2013-10-14 14:26+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -113,7 +113,7 @@ msgstr ""
msgid "%s: faces %s"
msgstr ""

#: lib/Image.php:1082
#: lib/Image.php:1080
#, php-format
msgid "(c) %s %s"
msgstr ""
Expand Down Expand Up @@ -146,7 +146,7 @@ msgstr ""
msgid "Access denied adding tags to this gallery."
msgstr ""

#: lib/Image.php:1230
#: lib/Image.php:1228
msgid "Access denied adding tags to this photo."
msgstr ""

Expand All @@ -166,7 +166,7 @@ msgstr ""
msgid "Access denied deleting photos from this gallery."
msgstr ""

#: lib/ActionHandler.php:947 lib/ActionHandler.php:972 lib/Api.php:518
#: lib/ActionHandler.php:948 lib/ActionHandler.php:973 lib/Api.php:518
msgid "Access denied deleting this gallery."
msgstr ""

Expand All @@ -175,15 +175,15 @@ msgid "Access denied downloading full sized photos from this gallery."
msgstr ""

#: lib/ActionHandler.php:57 lib/ActionHandler.php:232
#: lib/ActionHandler.php:900 lib/Image.php:913
#: lib/ActionHandler.php:901 lib/Image.php:921
msgid "Access denied downloading photos from this gallery."
msgstr ""

#: lib/View/GalleryProperties.php:246
msgid "Access denied editing galleries."
msgstr ""

#: faces/custom.php:36 lib/ActionHandler.php:495 lib/ActionHandler.php:824
#: faces/custom.php:36 lib/ActionHandler.php:495 lib/ActionHandler.php:825
#: lib/Faces/Base.php:434 lib/Faces/Base.php:522
msgid "Access denied editing the photo."
msgstr ""
Expand Down Expand Up @@ -223,7 +223,7 @@ msgid "Access denied viewing this gallery."
msgstr ""

#: img/download.php:17 img/full.php:17 img/index.php:17 img/mini.php:17
#: img/screen.php:17 img/thumb.php:31 lib/Image.php:1192
#: img/screen.php:17 img/thumb.php:31 lib/Image.php:1190
msgid "Access denied viewing this photo."
msgstr ""

Expand Down Expand Up @@ -280,7 +280,7 @@ msgstr ""
msgid "Administrators"
msgstr ""

#: report.php:45
#: report.php:52
msgid "Advertisement content"
msgstr ""

Expand Down Expand Up @@ -381,8 +381,8 @@ msgstr ""

#: disclamer.php:30 disclamer.php:33 faces/claim.php:34 faces/report.php:37
#: faces/savecustom.php:28 lib/Form/Upload.php:30 lib/View/Upload.php:256
#: report.php:43 templates/faces/custom.inc:19 templates/faces/define.inc:39
#: templates/gallery/delete_confirmation.inc:13
#: report.php:49 report.php:68 templates/faces/custom.inc:19
#: templates/faces/define.inc:39 templates/gallery/delete_confirmation.inc:13
#: templates/gallery/properties.html.php:135 templates/image/crop_image.inc:90
#: templates/image/edit_image.inc:8 templates/image/resize_image.inc:7
msgid "Cancel"
Expand Down Expand Up @@ -488,7 +488,7 @@ msgstr[1] ""
msgid "Copy"
msgstr ""

#: report.php:48
#: report.php:55
msgid "Copyright infringement"
msgstr ""

Expand Down Expand Up @@ -534,7 +534,7 @@ msgstr ""
msgid "Created"
msgstr ""

#: lib/ActionHandler.php:838 templates/image/crop_image.inc:111
#: lib/ActionHandler.php:839 templates/image/crop_image.inc:111
#: templates/image/edit_image.inc:30 templates/image/resize_image.inc:29
msgid "Crop"
msgstr ""
Expand Down Expand Up @@ -693,7 +693,7 @@ msgstr ""
msgid "Edit Permissions for %s"
msgstr ""

#: lib/ActionHandler.php:769
#: lib/ActionHandler.php:770
msgid "Edit Photo"
msgstr ""

Expand Down Expand Up @@ -857,15 +857,15 @@ msgstr ""
msgid "Gallery %s not found."
msgstr ""

#: lib/Widget/Actions.php:37
#: lib/Widget/Actions.php:39
msgid "Gallery Actions"
msgstr ""

#: templates/gallery/properties.html.php:90
msgid "Gallery Ages"
msgstr ""

#: faces/claim.php:47 faces/report.php:50 report.php:65
#: faces/claim.php:47 faces/report.php:50 report.php:76
#: templates/gallery/properties.html.php:63
msgid "Gallery Description"
msgstr ""
Expand All @@ -874,7 +874,7 @@ msgstr ""
msgid "Gallery Display Name"
msgstr ""

#: report.php:66
#: report.php:77
msgid "Gallery Id"
msgstr ""

Expand All @@ -883,7 +883,7 @@ msgid "Gallery List"
msgstr ""

#: faces/claim.php:46 faces/report.php:49 lib/Block/MyGalleries.php:70
#: report.php:64
#: report.php:75
msgid "Gallery Name"
msgstr ""

Expand Down Expand Up @@ -923,11 +923,11 @@ msgstr ""
msgid "Gallery sorted."
msgstr ""

#: report.php:75 report.php:78
#: report.php:86 report.php:89
msgid "Gallery was not reported."
msgstr ""

#: report.php:73
#: report.php:84
msgid "Gallery was reported."
msgstr ""

Expand Down Expand Up @@ -1269,7 +1269,7 @@ msgstr ""
msgid "Number of tiles per row"
msgstr ""

#: report.php:47
#: report.php:54
msgid "Offensive content"
msgstr ""

Expand Down Expand Up @@ -1446,7 +1446,7 @@ msgstr ""
msgid "Preview"
msgstr ""

#: lib/ActionHandler.php:773 lib/ActionHandler.php:842
#: lib/ActionHandler.php:774 lib/ActionHandler.php:843
#, php-format
msgid "Preview changes for %s :: %s"
msgstr ""
Expand Down Expand Up @@ -1617,7 +1617,7 @@ msgstr ""
msgid "Replace photo with this file"
msgstr ""

#: report.php:43 report.php:62 templates/faces/face.inc:11
#: report.php:48 report.php:73 templates/faces/face.inc:11
#: templates/faces/search.inc:15 templates/tile/face.inc:31
#: templates/view/image.html.php:24 templates/widgets/actions.html.php:46
msgid "Report"
Expand All @@ -1640,11 +1640,11 @@ msgstr ""
msgid "Report face"
msgstr ""

#: report.php:57 report.php:68
#: report.php:64 report.php:79
msgid "Report reason"
msgstr ""

#: report.php:56 report.php:67
#: report.php:63 report.php:78
msgid "Report type"
msgstr ""

Expand Down Expand Up @@ -1883,12 +1883,12 @@ msgstr ""
msgid "Subject"
msgstr ""

#: lib/ActionHandler.php:953
#: lib/ActionHandler.php:954
#, php-format
msgid "Successfully deleted %s."
msgstr ""

#: lib/ActionHandler.php:977
#: lib/ActionHandler.php:978
#, php-format
msgid "Successfully emptied \"%s\""
msgstr ""
Expand Down Expand Up @@ -1919,7 +1919,7 @@ msgstr ""
msgid "Tell us who is in this photo"
msgstr ""

#: report.php:46
#: report.php:53
msgid "Terms and conditions infringement"
msgstr ""

Expand Down Expand Up @@ -1951,15 +1951,15 @@ msgstr ""
msgid "The gallery was saved."
msgstr ""

#: lib/ActionHandler.php:1006
#: lib/ActionHandler.php:1007
msgid "The gallery's default photo has successfully been reset."
msgstr ""

#: lib/ActionHandler.php:1026
#: lib/ActionHandler.php:1027
msgid "The gallery's thumbnails have successfully been reset."
msgstr ""

#: lib/ActionHandler.php:1041
#: lib/ActionHandler.php:1042
msgid "The gallery's views have successfully been reset."
msgstr ""

Expand Down Expand Up @@ -1995,7 +1995,7 @@ msgstr ""
msgid "There are no photos in this gallery."
msgstr ""

#: lib/ActionHandler.php:957
#: lib/ActionHandler.php:958
#, php-format
msgid "There was a problem deleting %s: %s"
msgstr ""
Expand Down
Binary file modified ansel/locale/de/LC_MESSAGES/ansel.mo
View file
Binary file not shown.

0 comments on commit bbd2344

Please sign in to comment.