Committing extracted and compiled translations

diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo
index a1341a57f76dfbebb46594c65d9e7f9d987b5713..3287f078d7b210054501ed539af3a94876821cc5 100644 (file)
Binary files a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po
index 4fb5be781b3aadf35b60e628c8b01ad8a246a80b..5e7a9152ba1c22143cbe1b3a065f51d96459e970 100644 (file)
--- a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-19 14:21-0500\n"
-"PO-Revision-Date: 2012-08-19 19:21+0000\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -94,7 +94,9 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr "العنوان"
 
@@ -103,7 +105,8 @@ msgid "Description of this work"
 msgstr "وصف هذا العمل."
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -118,11 +121,11 @@ msgstr "الوسوم"
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr "المسار"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr "لا يمكن ترك المسار فارغًا"
 
@@ -165,30 +168,58 @@ msgstr ""
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr "يوجد ملف آخر بهذا المسار لدى هذى المستخدم."
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "أنت تحرّر وسائط مستخدم آخر. كن حذرًا أثناء العملية."
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "أنت تحرّر ملف مستخدم آخر. كن حذرًا أثناء العملية."
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr ""
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr ""
@@ -210,6 +241,72 @@ msgstr ""
 msgid "Video transcoding failed"
 msgstr ""
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr ""
@@ -218,14 +315,24 @@ msgstr ""
 msgid "File"
 msgstr "الملف"
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "يجب أن تضع ملفًا."
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr "يا سلام! نُشرَت!"
 
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr "صورة قزم مرتبك"
@@ -256,28 +363,32 @@ msgstr ""
 msgid "+ Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:68
-msgid "View your profile"
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/base.html:69
+msgid "View your profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:75
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr "لِج"
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -443,12 +554,17 @@ msgid "Editing %(media_title)s"
 msgstr "تحرير %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr "ألغِ"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:43
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr "احفظ التغييرات"
@@ -459,12 +575,19 @@ msgstr "احفظ التغييرات"
 msgid "Changing %(username)s's account settings"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr "تحرير ملف %(username)s الشخصي"
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -524,13 +647,67 @@ msgstr ""
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+msgid "Add"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-msgid "Add"
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr "أتود حقًا حذف %(title)s?"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
@@ -561,14 +738,6 @@ msgstr ""
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr ""
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr ""
@@ -595,22 +764,26 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
-msgstr "أتود حقًا حذف %(title)s?"
+msgid "Add %(title)s to collection"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
@@ -700,10 +873,28 @@ msgid "Add media"
 msgstr "أضف وسائط"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr "لا يبدو أنه توجد أي وسائط هنا حتى الآن..."
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr ""
@@ -755,35 +946,94 @@ msgstr ""
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr "أنا متأكد من رغبتي بحذف هذا العمل"
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "أنت على وشك حذف وسائط مستخدم آخر. كن حذرًا أثناء العملية."
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo
index 99dfca519bdef64e7dff6e80fb7b98d34e4eca98..57f1a33cedec21cf41d1d5e00c83dfd4e911a8f9 100644 (file)
Binary files a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po
index 853be57e38f4c7fd509109ceec28df451dd1b6ea..aa21676c0c17f8d367c90027de5b10312decddc6 100644 (file)
--- a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-19 14:21-0500\n"
-"PO-Revision-Date: 2012-08-19 19:21+0000\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: ca\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -93,7 +93,9 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr "Títol"
 
@@ -102,7 +104,8 @@ msgid "Description of this work"
 msgstr ""
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -117,11 +120,11 @@ msgstr "Etiquetes"
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr ""
 
@@ -164,30 +167,58 @@ msgstr ""
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Esteu editant fitxers d'un altre usuari. Aneu amb compte."
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Esteu editant el perfil d'un usuari. Aneu amb compte"
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr ""
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr ""
@@ -209,6 +240,72 @@ msgstr ""
 msgid "Video transcoding failed"
 msgstr ""
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr "Aquest tipus de fitxer no és vàlid."
@@ -217,14 +314,24 @@ msgstr "Aquest tipus de fitxer no és vàlid."
 msgid "File"
 msgstr "Fitxer"
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Heu d'escollir un fitxer."
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr "Visca! S'ha enviat!"
 
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr "Imatge de la pantalla 404, el goblin no sap què fer..."
@@ -255,28 +362,32 @@ msgstr ""
 msgid "+ Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:68
-msgid "View your profile"
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/base.html:69
+msgid "View your profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:75
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr "Entra"
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -442,12 +553,17 @@ msgid "Editing %(media_title)s"
 msgstr "Edició %(media_title)s "
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr "Cancel·la"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:43
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr "Desa els canvis"
@@ -458,12 +574,19 @@ msgstr "Desa els canvis"
 msgid "Changing %(username)s's account settings"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -523,13 +646,67 @@ msgstr ""
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+msgid "Add"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-msgid "Add"
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
@@ -560,14 +737,6 @@ msgstr ""
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr ""
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr ""
@@ -594,22 +763,26 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
+msgid "Add %(title)s to collection"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
@@ -699,10 +872,28 @@ msgid "Add media"
 msgstr "Tots els fitxers"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr "Icona RSS"
@@ -754,35 +945,94 @@ msgstr ""
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr ""
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo
index f36c1081dd2816f670e1c5f49658f8399acc78c9..3326f122b50c672c2f0c1165cf39831cdb57709b 100644 (file)
Binary files a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po
index 203d0262f1b331db90d5b1fea3a92707ea0f1ef5..a28bc45758bf995ac8ed5b18b2fab4020c7da638 100644 (file)
--- a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-19 14:21-0500\n"
-"PO-Revision-Date: 2012-08-19 19:21+0000\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: da\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -93,7 +93,9 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr "Titel"
 
@@ -102,7 +104,8 @@ msgid "Description of this work"
 msgstr ""
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -117,11 +120,11 @@ msgstr ""
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr ""
 
@@ -164,30 +167,58 @@ msgstr ""
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr ""
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr ""
@@ -209,6 +240,72 @@ msgstr ""
 msgid "Video transcoding failed"
 msgstr ""
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr ""
@@ -217,14 +314,24 @@ msgstr ""
 msgid "File"
 msgstr "Fil"
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr ""
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr ""
 
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr "Billede af stresset 404 goblin"
@@ -255,28 +362,32 @@ msgstr ""
 msgid "+ Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:68
-msgid "View your profile"
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/base.html:69
+msgid "View your profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:75
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr "Log ind"
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -442,12 +553,17 @@ msgid "Editing %(media_title)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr "Afbryd"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:43
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr "Gem ændringer"
@@ -458,12 +574,19 @@ msgstr "Gem ændringer"
 msgid "Changing %(username)s's account settings"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr "Redigerer %(username)s profil"
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -523,13 +646,67 @@ msgstr ""
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+msgid "Add"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-msgid "Add"
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
@@ -560,14 +737,6 @@ msgstr ""
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr ""
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr ""
@@ -594,22 +763,26 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
+msgid "Add %(title)s to collection"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
@@ -699,10 +872,28 @@ msgid "Add media"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr ""
@@ -754,35 +945,94 @@ msgstr ""
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr ""
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo
index 9d3468517985bd40e60cb5653dd4fe5db01ff112..10fbbb820cf1ccfa520749948bcdbb9c228d1f8a 100644 (file)
Binary files a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
index 024ad4be80a660a464ebe5bfd4706ec709696487..fcb9860ebbc0a835956390155441cb245d682290 100644 (file)
--- a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
@@ -18,16 +18,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-05 10:01-0500\n"
-"PO-Revision-Date: 2012-08-12 10:30+0000\n"
-"Last-Translator: Jakob Kramer <jakob.kramer@gmx.de>\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
+"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/mediagoblin/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -102,7 +102,9 @@ msgstr "Es konnte niemand mit diesem Nutzernamen oder Email gefunden werden."
 msgid "You can now log in using your new password."
 msgstr "Du kannst dich jetzt mit deinem neuen Passwort anmelden."
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr "Titel"
 
@@ -111,7 +113,8 @@ msgid "Description of this work"
 msgstr "Beschreibung des Werkes"
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -126,11 +129,11 @@ msgstr "Schlagwörter"
 msgid "Separate tags by commas."
 msgstr "Kommaseparierte Schlagwörter"
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr "Kurztitel"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr "Bitte gib einen Kurztitel ein"
 
@@ -173,30 +176,58 @@ msgstr "Neues Passwort"
 msgid "Email me when others comment on my media"
 msgstr "Mir eine E-Mail schicken, wenn andere meine Medien kommentieren"
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr "Diesen Kurztitel hast du bereits vergeben."
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Du bearbeitest die Medien eines Anderen. Sei bitte vorsichtig."
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Du bearbeitest das Profil eines Anderen. Sei bitte vorsichtig."
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr "Das Profil wurde aktualisiert"
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr "Kontoeinstellungen gespeichert"
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr "Falsches Passwort"
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr "Theme kann nicht verknüpft werden … Kein Theme gesetzt\n"
@@ -218,6 +249,72 @@ msgstr "Entschuldigung, dieser Dateityp wird nicht unterstützt."
 msgid "Video transcoding failed"
 msgstr "Videokonvertierung fehlgeschlagen"
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr "Die Datei stimmt nicht mit dem gewählten Medientyp überein."
@@ -226,27 +323,37 @@ msgstr "Die Datei stimmt nicht mit dem gewählten Medientyp überein."
 msgid "File"
 msgstr "Datei"
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Du musst eine Datei angeben."
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr "Yeeeaaah! Geschafft!"
 
-#: mediagoblin/templates/mediagoblin/404.html:22
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr "Bild eines angespannten Goblins"
 
-#: mediagoblin/templates/mediagoblin/404.html:23
+#: mediagoblin/templates/mediagoblin/404.html:25
 msgid "Oops!"
 msgstr "Hoppla!"
 
-#: mediagoblin/templates/mediagoblin/404.html:24
+#: mediagoblin/templates/mediagoblin/404.html:26
 msgid "There doesn't seem to be a page at this address. Sorry!"
 msgstr "Tut uns Leid, aber unter der angegebenen Adresse gibt es keine Seite!"
 
-#: mediagoblin/templates/mediagoblin/404.html:26
+#: mediagoblin/templates/mediagoblin/404.html:28
 msgid ""
 "If you're sure the address is correct, maybe the page you're looking for has"
 " been moved or deleted."
@@ -264,27 +371,32 @@ msgstr "Bitte bestätige deine E-Mail-Adresse!"
 msgid "+ Add media"
 msgstr "+ Medien hinzufügen"
 
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "View your profile"
 msgstr "Dein Profil ansehen"
 
-#: mediagoblin/templates/mediagoblin/base.html:69
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr "Abmelden"
 
-#: mediagoblin/templates/mediagoblin/base.html:74
-#: mediagoblin/templates/mediagoblin/auth/login.html:32
-#: mediagoblin/templates/mediagoblin/auth/login.html:50
+#: mediagoblin/templates/mediagoblin/base.html:75
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr "Anmelden"
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr "Diese Seite setzt das <a href=\"http://gnu.org/\">GNU</a>-Projekt <a href=\"http://mediagoblin.org/\">MediaGoblin</a> ein."
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -328,58 +440,62 @@ msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Registrie
 msgid "Most recent media"
 msgstr "Neuste Medien"
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:22
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
+#: mediagoblin/templates/mediagoblin/admin/panel.html:21
+#: mediagoblin/templates/mediagoblin/admin/panel.html:26
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26
 msgid "Media processing panel"
 msgstr "Medienverarbeitung"
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:25
+#: mediagoblin/templates/mediagoblin/admin/panel.html:29
 msgid ""
 "Here you can track the state of media being processed on this instance."
 msgstr "Hier kann man den Status von zu verarbeitenden Medien in diesem MediaGoblin-Exemplar sehen."
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:28
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:28
+#: mediagoblin/templates/mediagoblin/admin/panel.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
 msgid "Media in-processing"
 msgstr "Medien in Bearbeitung"
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:54
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:52
+#: mediagoblin/templates/mediagoblin/admin/panel.html:58
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
 msgid "No media in-processing"
 msgstr "Keine Medien in Bearbeitung"
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:55
+#: mediagoblin/templates/mediagoblin/admin/panel.html:61
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59
 msgid "These uploads failed to process:"
 msgstr "Die folgenden Uploads sind fehlgeschlagen:"
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:86
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:82
+#: mediagoblin/templates/mediagoblin/admin/panel.html:90
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
 msgid "No failed entries!"
 msgstr "Keine fehlgeschlagenen Einträge!"
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:88
+#: mediagoblin/templates/mediagoblin/admin/panel.html:92
 msgid "Last 10 successful uploads"
 msgstr "Die letzten zehn erfolgreichen Uploads"
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:108
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:103
+#: mediagoblin/templates/mediagoblin/admin/panel.html:112
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
 msgid "No processed entries, yet!"
 msgstr "Noch keine verarbeiteten Einträge!"
 
-#: mediagoblin/templates/mediagoblin/auth/change_fp.html:32
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
 msgid "Set your new password"
 msgstr "Dein neues Passwort"
 
-#: mediagoblin/templates/mediagoblin/auth/change_fp.html:35
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39
 msgid "Set password"
 msgstr "Passwort setzen"
 
-#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31
 msgid "Recover password"
 msgstr "Passwort wiederherstellen"
 
-#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:30
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34
 msgid "Send instructions"
 msgstr "Anweisungen senden"
 
@@ -397,27 +513,28 @@ msgid ""
 "a happy goblin!"
 msgstr "Hallo %(username)s,\n\num dein GNU-MediaGoblin-Passwort zu ändern, öffne folgende URL\nin deinem Webbrowser:\n\n%(verification_url)s\n\nWenn du denkst, dass es sich hierbei um einen Fehler handelt,\nignoriere einfach diese E-Mail und bleib ein glücklicher Goblin!"
 
-#: mediagoblin/templates/mediagoblin/auth/login.html:35
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
 msgid "Logging in failed!"
 msgstr "Anmeldevorgang fehlgeschlagen!"
 
-#: mediagoblin/templates/mediagoblin/auth/login.html:40
+#: mediagoblin/templates/mediagoblin/auth/login.html:44
 msgid "Don't have an account yet?"
 msgstr "Hast du noch keines? Es geht ganz einfach!"
 
-#: mediagoblin/templates/mediagoblin/auth/login.html:41
+#: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Create one here!"
 msgstr "Registriere dich hier!"
 
-#: mediagoblin/templates/mediagoblin/auth/login.html:47
+#: mediagoblin/templates/mediagoblin/auth/login.html:51
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: mediagoblin/templates/mediagoblin/auth/register.html:32
+#: mediagoblin/templates/mediagoblin/auth/register.html:28
+#: mediagoblin/templates/mediagoblin/auth/register.html:36
 msgid "Create an account!"
 msgstr "Neues Konto registrieren!"
 
-#: mediagoblin/templates/mediagoblin/auth/register.html:36
+#: mediagoblin/templates/mediagoblin/auth/register.html:40
 msgid "Create"
 msgstr "Registrieren"
 
@@ -432,32 +549,53 @@ msgid ""
 "%(verification_url)s"
 msgstr "Hallo %(username)s,\n\num dein Konto bei GNU MediaGoblin zu aktivieren, musst du folgende Adresse in deinem Webbrowser öffnen:\n\n%(verification_url)s"
 
-#: mediagoblin/templates/mediagoblin/edit/edit.html:29
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:23
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:35
+#, python-format
+msgid "Editing attachments for %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
 #, python-format
 msgid "Editing %(media_title)s"
 msgstr "%(media_title)s bearbeiten"
 
-#: mediagoblin/templates/mediagoblin/edit/edit.html:36
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: mediagoblin/templates/mediagoblin/edit/edit.html:37
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
-#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
+#: mediagoblin/templates/mediagoblin/edit/edit.html:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr "Änderungen speichern"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:34
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
 #, python-format
 msgid "Changing %(username)s's account settings"
 msgstr "%(username)ss Kontoeinstellungen ändern"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr "%(username)ss Profil bearbeiten"
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -517,14 +655,69 @@ msgstr "Hol dir auf <a href=\"http://getfirefox.com\">http://getfirefox.com</a>
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr "WebM-Datei (640p; VP8/Vorbis)"
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:26
-msgid "Add your media"
-msgstr "Deine Medien"
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:30
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
 msgid "Add"
 msgstr "Hinzufügen"
 
+#: mediagoblin/templates/mediagoblin/submit/start.html:23
+#: mediagoblin/templates/mediagoblin/submit/start.html:30
+msgid "Add your media"
+msgstr "Deine Medien"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr "Löschen"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr "Möchtest du %(title)s wirklich löschen?"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr "Dauerhaft löschen"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
 #, python-format
 msgid ""
@@ -553,14 +746,6 @@ msgstr "❖ Medien von <a href=\"%(user_url)s\">%(username)s</a>"
 msgid "Image for %(media_title)s"
 msgstr "Bild für %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr "Löschen"
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr "Einen Kommentar schreiben"
@@ -587,30 +772,34 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr "<h3>Veröffentlicht am</h3>\n      <p>%(date)s</p>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr "Anhänge"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr "Anhang hinzufügen"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
-msgstr "Möchtest du %(title)s wirklich löschen?"
+msgid "Add %(title)s to collection"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
-msgstr "Dauerhaft löschen"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:25
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
 msgid ""
 "You can track the state of media being processed for your gallery here."
 msgstr "Du kannst den Status der Medien, die sich gerade in Bearbeitung befinden, hier betrachten."
 
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
 msgid "Your last 10 successful uploads"
 msgstr "Deine zehn letzten erfolgreichen Uploads"
 
@@ -692,10 +881,28 @@ msgid "Add media"
 msgstr "Medien hinzufügen"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr "Scheinbar gibt es hier noch nichts …"
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr "Feed-Symbol"
@@ -747,35 +954,94 @@ msgstr "Schlagwörter"
 msgid "Could not read the image file."
 msgstr "Die Bilddatei konnte nicht gelesen werden."
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr "Ja, wirklich löschen"
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr "hat dein Medium kommentiert"
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr "Ohh, der Kommentar war leer."
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr "Dein Kommentar wurde gesendet!"
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr "Manche Dateien dieses Eintrags scheinen zu fehlen.  Es wird trotzdem gelöscht."
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr "Du hast das Medium gelöscht."
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Das Medium wurde nicht gelöscht, da nicht angekreuzt hast, dass du es wirklich löschen möchtest."
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Du versuchst Medien eines anderen Nutzers zu löschen. Sei bitte vorsichtig."
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po
index eab1940b1cf5734e48868da929024e74546115e5..f100f6add0cb1b547cc6fe95c1f7a06e0f7c8c7b 100644 (file)
--- a/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-08-22 16:54-0500\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\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"
@@ -89,7 +89,9 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr ""
 
@@ -98,7 +100,8 @@ msgid "Description of this work"
 msgstr ""
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a "
@@ -114,11 +117,11 @@ msgstr ""
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr ""
 
@@ -161,30 +164,58 @@ msgstr ""
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr ""
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr ""
@@ -206,6 +237,76 @@ msgstr ""
 msgid "Video transcoding failed"
 msgstr ""
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can "
+"not be\n"
+"                intercepted by the user agent (e.g. server-side "
+"client).<br />\n"
+"                <strong>Public</strong> - The client can't make "
+"confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-"
+"side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr ""
@@ -214,14 +315,24 @@ msgstr ""
 msgid "File"
 msgstr ""
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr ""
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr ""
 
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr ""
@@ -252,28 +363,32 @@ msgstr ""
 msgid "+ Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:68
-msgid "View your profile"
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/base.html:69
+msgid "View your profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:75
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -441,12 +556,17 @@ msgid "Editing %(media_title)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:43
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr ""
@@ -457,12 +577,19 @@ msgstr ""
 msgid "Changing %(username)s's account settings"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -522,13 +649,67 @@ msgstr ""
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+msgid "Add"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-msgid "Add"
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
@@ -560,14 +741,6 @@ msgstr ""
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr ""
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr ""
@@ -594,22 +767,26 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
+msgid "Add %(title)s to collection"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
@@ -697,10 +874,28 @@ msgid "Add media"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr ""
@@ -752,35 +947,94 @@ msgstr ""
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr ""
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
 
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed "
+"with caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were "
+"sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid "You are about to delete another user's collection. Proceed with caution."
+msgstr ""
+

diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo
index db98eb28069ef915d5ff230194511a3b995cde9e..3f4ae403a49b3a3fe23b79ababe5e7710f899eed 100644 (file)
Binary files a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po
index 8d0cfe235e5353930073f9a8ec77159e766249b2..c67771a3a3c59e8683050736c1a9da5b3f30e8b9 100644 (file)
--- a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po
@@ -10,16 +10,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-19 14:21-0500\n"
-"PO-Revision-Date: 2012-08-21 14:20+0000\n"
-"Last-Translator: aleksejrs <deletesoftware@yandex.ru>\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
+"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -94,7 +94,9 @@ msgstr "Mi trovis neniun kun tiu salutnomo aŭ retpoŝtadreso."
 msgid "You can now log in using your new password."
 msgstr "Nun vi povas ensaluti per via nova pasvorto."
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr "Titolo"
 
@@ -103,7 +105,8 @@ msgid "Description of this work"
 msgstr "Priskribo de ĉi tiu verko"
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -118,11 +121,11 @@ msgstr "Etikedoj"
 msgid "Separate tags by commas."
 msgstr "Dividu la etikedojn per komoj."
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr "La distingiga adresparto"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr "La distingiga adresparto ne povas esti malplena"
 
@@ -165,30 +168,58 @@ msgstr "La nova pasvorto"
 msgid "Email me when others comment on my media"
 msgstr "Retpoŝtu min kiam aliaj komentas pri miaj alŝutaĵoj."
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr "Ĉi tiu uzanto jam havas dosieron kun tiu distingiga adresparto."
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Vi priredaktas dosieron de alia uzanto. Agu singardeme."
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Vi redaktas profilon de alia uzanto. Agu singardeme."
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr "Profilŝanĝoj estis konservitaj"
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr "Kontagordoj estis konservitaj"
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr "Malĝusta pasvorto"
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr "Alligo de etoso ne eblas… ne estas elektita ekzistanta etoso\n"
@@ -210,6 +241,72 @@ msgstr "Mi pardonpetas, mi ne subtenas tiun dosiertipon :("
 msgid "Video transcoding failed"
 msgstr "Malsukcesis transkodado de filmo"
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr "La provizita dosiero ne konformas al la informtipo."
@@ -218,14 +315,24 @@ msgstr "La provizita dosiero ne konformas al la informtipo."
 msgid "File"
 msgstr "Dosiero"
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Vi devas provizi dosieron."
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr "Hura! Alŝutitas!"
 
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr "Bildo de 404-koboldo penŝvitanta."
@@ -256,28 +363,32 @@ msgstr "Konfirmu viecon de la retpoŝtadreso!"
 msgid "+ Add media"
 msgstr "+ Aldoni dosieron"
 
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "View your profile"
 msgstr "Vidi vian profilon"
 
-#: mediagoblin/templates/mediagoblin/base.html:69
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr "Elsaluti"
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:75
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr "Ensaluti"
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr "Funkcias per <a href=\"http://mediagoblin.org\">MediaGoblin</a>, unu el la <a href=\"http://gnu.org/\">projektoj de GNU</a>."
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -443,12 +554,17 @@ msgid "Editing %(media_title)s"
 msgstr "Priredaktado de %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr "Nuligi"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:43
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr "Konservi ŝanĝojn"
@@ -459,12 +575,19 @@ msgstr "Konservi ŝanĝojn"
 msgid "Changing %(username)s's account settings"
 msgstr "Ŝanĝado de kontagordoj de %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr "Redaktado de l’profilo de %(username)s'"
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -524,14 +647,68 @@ msgstr "Vi povas akiri modernan TTT-legilon,\n<span class=\"whitespace other\" t
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr "la WebM-dosieron (640p; VP8/Vorbis)"
 
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+msgid "Add"
+msgstr "Aldoni"
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
 msgstr "Aldono de via dosiero"
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-msgid "Add"
-msgstr "Aldoni"
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr "Ŝanĝi"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr "Forigi"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr "Ĉu vere forigi %(title)s?"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr "Forigi senrevene"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
 #, python-format
@@ -561,14 +738,6 @@ msgstr "❖ Просмотр файлов пользователя <a href=\"%(u
 msgid "Image for %(media_title)s"
 msgstr "Bildo de «%(media_title)s»"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr "Ŝanĝi"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr "Forigi"
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr "Aldoni komenton"
@@ -595,23 +764,27 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr "<h3>Aldonita je</h3>\n      <p>la %(date)s</p>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr "Kundosieroj"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr "Aldoni kundosieron"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
-msgstr "Ĉu vere forigi %(title)s?"
+msgid "Add %(title)s to collection"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
-msgstr "Forigi senrevene"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
 msgid ""
@@ -700,10 +873,28 @@ msgid "Add media"
 msgstr "Aldoni dosieron"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr "Ĉi tie ŝajne estas ankoraŭ neniuj dosieroj…"
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr "flusimbolo"
@@ -755,35 +946,94 @@ msgstr "Markita per"
 msgid "Could not read the image file."
 msgstr "Malsukcesis lego de la bildodosiero"
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr "Jes, mi volas forigi ĉi tion."
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr "komentis je via afiŝo"
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr "Oj, via komento estis malplena."
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr "Via komento estis afiŝita!"
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr "Iuj dosieroj de ĉi tiu ero ŝajne mankas.  Mi tamen forigas."
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr "Vi forigis la dosieron."
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "La dosiero ne estis forigita, ĉar vi ne konfirmis vian certecon per la markilo."
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Vi estas forigonta dosieron de alia uzanto. Estu singardema."
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo
index 89f60e289696e37b62a480ad2db0df9186dbfbcf..76d2f286b1840f14a7a33657f0eb244cf7202594 100644 (file)
Binary files a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
index b86413bfb717d406caf29f2b7025108b821f05d8..3bbf619472bbe542c9586e65d665316993fc452d 100644 (file)
--- a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
@@ -5,7 +5,7 @@
 # Translators:
 #   <deletesoftware@yandex.ru>, 2011, 2012.
 #   <ekenbrand@hotmail.com>, 2011.
-#   <jacobo@gnu.org>, 2011, 2012.
+#   <jacobo@gnu.org>, 2011-2012.
 # Javier Di Mauro <javierdimauro@gmail.com>, 2011.
 #   <juangsub@gmail.com>, 2011.
 #   <juanma@kde.org.ar>, 2011, 2012.
@@ -17,16 +17,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-05 10:01-0500\n"
-"PO-Revision-Date: 2012-08-11 17:17+0000\n"
-"Last-Translator: larjona <larjona99@gmail.com>\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
+"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/mediagoblin/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -101,7 +101,9 @@ msgstr "No se pudo encontrar a alguien con ese nombre de usuario o correo electr
 msgid "You can now log in using your new password."
 msgstr "Ahora tu puedes entrar usando tu nueva contraseña."
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr "Título"
 
@@ -110,7 +112,8 @@ msgid "Description of this work"
 msgstr "Descripción de esta obra"
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -125,11 +128,11 @@ msgstr "Etiquetas"
 msgid "Separate tags by commas."
 msgstr "Separa las etiquetas por comas."
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr "Ficha"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr "La ficha no puede estar vacía"
 
@@ -172,30 +175,58 @@ msgstr "Nueva contraseña"
 msgid "Email me when others comment on my media"
 msgstr "Envíame un correo cuando otros escriban comentarios sobre mi contenido"
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr "Una entrada con esa ficha ya existe para este usuario."
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Estás editando el contenido de otro usuario. Proceder con precaución."
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Estás editando un perfil de usuario. Proceder con precaución."
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr "Los cambios de perfil fueron salvados"
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr "las configuraciones de cuenta fueron salvadas"
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr "Contraseña incorrecta"
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr "No puedo enlazar al tema... no hay tema seleccionado\n"
@@ -217,6 +248,72 @@ msgstr "Lo sentidos, No soportamos ese tipo de archivo :("
 msgid "Video transcoding failed"
 msgstr "Ha fallado la conversión de vídeo"
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr "Archivo inválido para el formato seleccionado."
@@ -225,27 +322,37 @@ msgstr "Archivo inválido para el formato seleccionado."
 msgid "File"
 msgstr "Archivo"
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Debes proporcionar un archivo."
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr "¡Yujú! ¡Enviado!"
 
-#: mediagoblin/templates/mediagoblin/404.html:22
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr "Imagen de 404 goblin estresándose"
 
-#: mediagoblin/templates/mediagoblin/404.html:23
+#: mediagoblin/templates/mediagoblin/404.html:25
 msgid "Oops!"
 msgstr "¡Ups!"
 
-#: mediagoblin/templates/mediagoblin/404.html:24
+#: mediagoblin/templates/mediagoblin/404.html:26
 msgid "There doesn't seem to be a page at this address. Sorry!"
 msgstr "Parece no haber una página en esta dirección. ¡Lo siento!"
 
-#: mediagoblin/templates/mediagoblin/404.html:26
+#: mediagoblin/templates/mediagoblin/404.html:28
 msgid ""
 "If you're sure the address is correct, maybe the page you're looking for has"
 " been moved or deleted."
@@ -263,27 +370,32 @@ msgstr "¡Verifica tu email!"
 msgid "+ Add media"
 msgstr "+Agregar contenido"
 
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "View your profile"
 msgstr "Ver tu perfil"
 
-#: mediagoblin/templates/mediagoblin/base.html:69
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr "Salir "
 
-#: mediagoblin/templates/mediagoblin/base.html:74
-#: mediagoblin/templates/mediagoblin/auth/login.html:32
-#: mediagoblin/templates/mediagoblin/auth/login.html:50
+#: mediagoblin/templates/mediagoblin/base.html:75
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr "Conectarse"
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr "Potenciado por <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un proyecto <a href=\"http://gnu.org/\">GNU</a>."
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -327,58 +439,62 @@ msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Crea una
 msgid "Most recent media"
 msgstr "El contenido más reciente"
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:22
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
+#: mediagoblin/templates/mediagoblin/admin/panel.html:21
+#: mediagoblin/templates/mediagoblin/admin/panel.html:26
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26
 msgid "Media processing panel"
 msgstr "Panel de procesamiento de contenido"
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:25
+#: mediagoblin/templates/mediagoblin/admin/panel.html:29
 msgid ""
 "Here you can track the state of media being processed on this instance."
 msgstr "Aquí puede llevar un seguimiento del estado del contenido que se está procesando en esta instancia."
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:28
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:28
+#: mediagoblin/templates/mediagoblin/admin/panel.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
 msgid "Media in-processing"
 msgstr "Procesando contenido"
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:54
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:52
+#: mediagoblin/templates/mediagoblin/admin/panel.html:58
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
 msgid "No media in-processing"
 msgstr "No hay contenidos en procesamiento"
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:55
+#: mediagoblin/templates/mediagoblin/admin/panel.html:61
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59
 msgid "These uploads failed to process:"
 msgstr "Estos archivos no pudieron ser procesados:"
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:86
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:82
+#: mediagoblin/templates/mediagoblin/admin/panel.html:90
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
 msgid "No failed entries!"
 msgstr "¡No han fallado entradas!"
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:88
+#: mediagoblin/templates/mediagoblin/admin/panel.html:92
 msgid "Last 10 successful uploads"
 msgstr "Últimos 10 envíos con éxito"
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:108
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:103
+#: mediagoblin/templates/mediagoblin/admin/panel.html:112
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
 msgid "No processed entries, yet!"
 msgstr "¡Aún no hay entradas procesadas!"
 
-#: mediagoblin/templates/mediagoblin/auth/change_fp.html:32
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
 msgid "Set your new password"
 msgstr "Coloca tu nueva contraseña "
 
-#: mediagoblin/templates/mediagoblin/auth/change_fp.html:35
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39
 msgid "Set password"
 msgstr "Coloca la contraseña"
 
-#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31
 msgid "Recover password"
 msgstr "Recuperar contraseña"
 
-#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:30
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34
 msgid "Send instructions"
 msgstr "Enviar instrucciones"
 
@@ -396,27 +512,28 @@ msgid ""
 "a happy goblin!"
 msgstr "Hola %(username)s,\n\nPara cambiar tu contraseña de GNU MediaGoblin, abre la siguiente URL en un navegador:\n\n%(verification_url)s \n\nSi piensas que esto es un error, simplemente ignora este mensaje y sigue siendo un trasgo feliz."
 
-#: mediagoblin/templates/mediagoblin/auth/login.html:35
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
 msgid "Logging in failed!"
 msgstr "¡Falló en el inicio de sesión!"
 
-#: mediagoblin/templates/mediagoblin/auth/login.html:40
+#: mediagoblin/templates/mediagoblin/auth/login.html:44
 msgid "Don't have an account yet?"
 msgstr "¿No tienes una cuenta?"
 
-#: mediagoblin/templates/mediagoblin/auth/login.html:41
+#: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Create one here!"
 msgstr "¡Crea una aquí!"
 
-#: mediagoblin/templates/mediagoblin/auth/login.html:47
+#: mediagoblin/templates/mediagoblin/auth/login.html:51
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
-#: mediagoblin/templates/mediagoblin/auth/register.html:32
+#: mediagoblin/templates/mediagoblin/auth/register.html:28
+#: mediagoblin/templates/mediagoblin/auth/register.html:36
 msgid "Create an account!"
 msgstr "¡Crea una cuenta!"
 
-#: mediagoblin/templates/mediagoblin/auth/register.html:36
+#: mediagoblin/templates/mediagoblin/auth/register.html:40
 msgid "Create"
 msgstr "Crear"
 
@@ -431,32 +548,53 @@ msgid ""
 "%(verification_url)s"
 msgstr "Hola %(username)s,\n\npara activar tu cuenta de GNU MediaGoblin, abre la siguiente URL en tu navegador:\n\n%(verification_url)s "
 
-#: mediagoblin/templates/mediagoblin/edit/edit.html:29
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:23
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:35
+#, python-format
+msgid "Editing attachments for %(media_title)s"
+msgstr "Editing attachments for %(media_title)s"
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
 #, python-format
 msgid "Editing %(media_title)s"
 msgstr "Editando %(media_title)s "
 
-#: mediagoblin/templates/mediagoblin/edit/edit.html:36
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: mediagoblin/templates/mediagoblin/edit/edit.html:37
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
-#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
+#: mediagoblin/templates/mediagoblin/edit/edit.html:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr "Guardar cambios"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:34
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
 #, python-format
 msgid "Changing %(username)s's account settings"
 msgstr "Cambio de %(username)s la configuración de la cuenta "
 
-#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr "Editando el perfil de %(username)s"
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -516,14 +654,69 @@ msgstr "Tú puedes conseguir un navegador web moderno que\n<span class=\"whitesp
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr "Archivo WebM (640p; VP8/Vorbis)"
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:26
-msgid "Add your media"
-msgstr "Añade tu contenido "
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:30
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
 msgid "Add"
 msgstr "Añadir "
 
+#: mediagoblin/templates/mediagoblin/submit/start.html:23
+#: mediagoblin/templates/mediagoblin/submit/start.html:30
+msgid "Add your media"
+msgstr "Añade tu contenido "
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr "Editar"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr "Borrar"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr "¿Realmente deseas eliminar %(title)s?"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr "Eliminar permanentemente"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
 #, python-format
 msgid ""
@@ -552,14 +745,6 @@ msgstr "❖ Explorando contenido de <a href=\"%(user_url)s\">%(username)s</a>"
 msgid "Image for %(media_title)s"
 msgstr "Imágenes para %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr "Editar"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr "Borrar"
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr "Añadir un comentario"
@@ -586,30 +771,34 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr "<h3>Añadido en</h3>\n      <p>%(date)s</p>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr "Agregar adjunto"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
-msgstr "¿Realmente deseas eliminar %(title)s?"
+msgid "Add %(title)s to collection"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
-msgstr "Eliminar permanentemente"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:25
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
 msgid ""
 "You can track the state of media being processed for your gallery here."
 msgstr "Puedes hacer un seguimiento del estado de tu contenido siendo procesado aquí."
 
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
 msgid "Your last 10 successful uploads"
 msgstr "Tus últimos 10 envíos con éxito"
 
@@ -691,10 +880,28 @@ msgid "Add media"
 msgstr "Añadir contenido"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr "Parece que aún no hay ningún contenido aquí..."
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr "Icono feed"
@@ -746,35 +953,94 @@ msgstr "Marcado con"
 msgid "Could not read the image file."
 msgstr "No se pudo leer el archivo de imagen."
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr "Estoy seguro de que quiero borrar esto"
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr "escribieron comentarios sobre tu publicación"
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr "Ups, tu comentario estaba vacío."
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr "¡Tu comentario ha sido publicado!"
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr "Algunos de los ficheros en esta entrada parece que se han perdido. Borrando igualmente."
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr "Eliminaste el contenido"
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "El contenido no se eliminó porque no marcaste que estabas seguro."
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Estás a punto de eliminar un contenido de otro usuario. Proceder con precaución."
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo
index ed449b8f254d7634c5272436c0d5642c3d7e56f1..2f4c96c964cea88aa7adc1eead73a500117b967e 100644 (file)
Binary files a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po
index b097030a14d74653f269b39e0e4dc8277cefae9e..a5ac9945109b41cc2c44b53f218899e8d51c1ab7 100644 (file)
--- a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-19 14:21-0500\n"
-"PO-Revision-Date: 2012-08-19 19:21+0000\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: fa\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -92,7 +92,9 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr "عنوان"
 
@@ -101,7 +103,8 @@ msgid "Description of this work"
 msgstr ""
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -116,11 +119,11 @@ msgstr "برچسب"
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr ""
 
@@ -163,30 +166,58 @@ msgstr ""
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "شما در حال ویرایش رسانه کاربر دیگری هستید.با احتیاط عمل کنید"
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "شما در حال ویرایش نمایه کاربر دیگری هستید.با احتیاط عمل کنید."
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr ""
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr ""
@@ -208,6 +239,72 @@ msgstr ""
 msgid "Video transcoding failed"
 msgstr ""
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr "فایلی نا معتبر برای نوع رسانه داده شده."
@@ -216,14 +313,24 @@ msgstr "فایلی نا معتبر برای نوع رسانه داده شده."
 msgid "File"
 msgstr "فایل"
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "شما باید فایلی ارايه بدهید."
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr "هورا!ثبت شد!"
 
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr ""
@@ -254,28 +361,32 @@ msgstr ""
 msgid "+ Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:68
-msgid "View your profile"
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/base.html:69
+msgid "View your profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:75
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr "ورود"
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -441,12 +552,17 @@ msgid "Editing %(media_title)s"
 msgstr "ویرایش %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr "انصراف"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:43
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr "ذخیره تغییرات"
@@ -457,12 +573,19 @@ msgstr "ذخیره تغییرات"
 msgid "Changing %(username)s's account settings"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr "در حال ویرایش نمایه %(username)s"
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -522,13 +645,67 @@ msgstr ""
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+msgid "Add"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-msgid "Add"
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
@@ -559,14 +736,6 @@ msgstr ""
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr ""
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr ""
@@ -593,22 +762,26 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
+msgid "Add %(title)s to collection"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
@@ -698,10 +871,28 @@ msgid "Add media"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr ""
@@ -753,35 +944,94 @@ msgstr ""
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr ""
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo
index c49f2fc1af040bfcfd6dd8a432f53f7848ff955b..ffdc76c9c0337ff802458ea269057ee7499913f2 100644 (file)
Binary files a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po
index 5c6213817eb251447292632c8421604a137ca94f..f7fadb576707e16b1a65c748bf27cdbdf0c16266 100644 (file)
--- a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-19 14:21-0500\n"
-"PO-Revision-Date: 2012-08-19 19:21+0000\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/mediagoblin/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -98,7 +98,9 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr "Titre"
 
@@ -107,7 +109,8 @@ msgid "Description of this work"
 msgstr "Descriptif pour ce travail"
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -122,11 +125,11 @@ msgstr "Tags"
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr "Légende"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr "La légende ne peut pas être laissée vide."
 
@@ -169,30 +172,58 @@ msgstr ""
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr "Une entrée existe déjà pour cet utilisateur avec la même légende."
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Vous vous apprêtez à modifier le média d'un autre utilisateur. Veuillez prendre garde."
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Vous vous apprêtez à modifier le profil d'un utilisateur. Veuillez prendre garde."
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr "Mauvais mot de passe"
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr ""
@@ -214,6 +245,72 @@ msgstr ""
 msgid "Video transcoding failed"
 msgstr ""
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr "Le fichier envoyé  ne correspond pas au type de média."
@@ -222,14 +319,24 @@ msgstr "Le fichier envoyé  ne correspond pas au type de média."
 msgid "File"
 msgstr "Fichier"
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Il vous faut fournir un fichier."
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr "Youhou, c'est envoyé !"
 
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr "Image de 404 gobelin angoissé"
@@ -260,28 +367,32 @@ msgstr "Vérifiez votre adresse e-mail !"
 msgid "+ Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:68
-msgid "View your profile"
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/base.html:69
+msgid "View your profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:75
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr "S'identifier"
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -447,12 +558,17 @@ msgid "Editing %(media_title)s"
 msgstr "Modification de %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr "Annuler"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:43
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr "Enregistrer les modifications"
@@ -463,12 +579,19 @@ msgstr "Enregistrer les modifications"
 msgid "Changing %(username)s's account settings"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr "Modification du profil de %(username)s"
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -528,13 +651,67 @@ msgstr ""
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+msgid "Add"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-msgid "Add"
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr "Éditer"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr "Effacer"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr "Voulez-vous vraiment supprimer %(title)s ?"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
@@ -565,14 +742,6 @@ msgstr ""
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr "Éditer"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr "Effacer"
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr ""
@@ -599,22 +768,26 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
-msgstr "Voulez-vous vraiment supprimer %(title)s ?"
+msgid "Add %(title)s to collection"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
@@ -704,10 +877,28 @@ msgid "Add media"
 msgstr "Ajouter des médias"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr "Il ne semble pas y avoir de média là, pour l'instant ..."
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr "icone de flux"
@@ -759,35 +950,94 @@ msgstr ""
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr "Je suis sûr de vouloir supprimer cela"
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr "Oups, votre commentaire était vide."
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr "Votre commentaire a été posté !"
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr "Vous avez supprimé le media."
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Ce media n'a pas été supprimé car vous n'avez pas confirmer que vous étiez sur."
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Vous êtes sur le point de supprimer des médias d'un autre utilisateur. Procédez avec prudence."
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo
index 05ae27feb1a33b732acb38948dc828e7627ec6a2..2708f251d25971fcdc1be3b1e1296df5730397d7 100644 (file)
Binary files a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po
index 3cea8fc98dec233fd944e75ecaa874e6475640ce..b4a28c8384b35d69fd094ae9507eb39e81404f25 100644 (file)
--- a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
+# Aleksandr Brezhnev <abrezhnev@gmail.com>, 2012.
 # Emilio Sepúlveda <djfunkinmixer@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-19 14:21-0500\n"
-"PO-Revision-Date: 2012-08-19 19:21+0000\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: ia\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -92,7 +93,9 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr "Titulo"
 
@@ -101,7 +104,8 @@ msgid "Description of this work"
 msgstr ""
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -110,17 +114,17 @@ msgstr ""
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
-msgstr ""
+msgstr "Etiquettas"
 
 #: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr ""
 
@@ -163,30 +167,58 @@ msgstr ""
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr ""
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr ""
@@ -208,22 +240,98 @@ msgstr ""
 msgid "Video transcoding failed"
 msgstr ""
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr ""
 
 #: mediagoblin/submit/forms.py:26
 msgid "File"
-msgstr ""
+msgstr "File"
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr ""
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr ""
 
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr ""
@@ -254,28 +362,32 @@ msgstr ""
 msgid "+ Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:68
-msgid "View your profile"
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/base.html:69
+msgid "View your profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:75
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr "Initiar session"
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -441,12 +553,17 @@ msgid "Editing %(media_title)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr "Cancellar"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:43
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr ""
@@ -457,12 +574,19 @@ msgstr ""
 msgid "Changing %(username)s's account settings"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -522,13 +646,67 @@ msgstr ""
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+msgid "Add"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-msgid "Add"
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
@@ -559,14 +737,6 @@ msgstr ""
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr ""
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr ""
@@ -593,22 +763,26 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
+msgid "Add %(title)s to collection"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
@@ -698,10 +872,28 @@ msgid "Add media"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr ""
@@ -753,35 +945,94 @@ msgstr ""
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr ""
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo
index b2e9f9887b3621af8223ec2b57f56656ba29de1e..5b0a911683040dff8290f45f973cb633b1100b25 100644 (file)
Binary files a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po
index 16ecd20c614c9a1d2cb34cc1f45377e90ef45bd4..68ad3885e1d77c69310a7cb30969fbba4a7a81de 100644 (file)
--- a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po
@@ -6,12 +6,13 @@
 # Francesco Apruzzese <cescoap@gmail.com>, 2012.
 #   <pikappa469@alice.it>, 2011.
 #   <robi@nunnisoft.ch>, 2011.
+#   <sun_lion@live.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-19 14:21-0500\n"
-"PO-Revision-Date: 2012-08-19 19:21+0000\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -35,7 +36,7 @@ msgstr "Indirizzo email"
 
 #: mediagoblin/auth/forms.py:51
 msgid "Username or email"
-msgstr ""
+msgstr "Nome utente o indirizzo email"
 
 #: mediagoblin/auth/forms.py:58
 msgid "Incorrect input"
@@ -43,11 +44,11 @@ msgstr ""
 
 #: mediagoblin/auth/views.py:55
 msgid "Sorry, registration is disabled on this instance."
-msgstr "Spiacente, registrazione è disabilitata su questa istanza"
+msgstr "Spiacente, la registrazione è disabilitata su questa istanza."
 
 #: mediagoblin/auth/views.py:75
 msgid "Sorry, a user with that name already exists."
-msgstr "Spiacente, esiste già un utente con quel nome"
+msgstr "Spiacente, esiste già un utente con quel nome."
 
 #: mediagoblin/auth/views.py:79
 msgid "Sorry, a user with that email address already exists."
@@ -57,7 +58,7 @@ msgstr "Siamo spiacenti, un utente con quell'indirizzo email esiste già."
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
-msgstr "Il tuo indirizzo email è stato verificato. Puoi ora fare login, modificare il tuo profilo, e inserire immagini!"
+msgstr "Il tuo indirizzo email è stato verificato. Ora puoi accedere, modificare il tuo profilo e caricare immagini!"
 
 #: mediagoblin/auth/views.py:188
 msgid "The verification key or user id is incorrect"
@@ -65,7 +66,7 @@ msgstr "La chiave di verifica o l'id utente è sbagliato"
 
 #: mediagoblin/auth/views.py:206
 msgid "You must be logged in so we know who to send the email to!"
-msgstr "Devi entrare col tuo profilo così possiamo sapere a chi inviare l'email!"
+msgstr "Devi effettuare l'accesso così possiamo sapere a chi inviare l'email!"
 
 #: mediagoblin/auth/views.py:214
 msgid "You've already verified your email address!"
@@ -84,17 +85,19 @@ msgstr "Ti è stata inviata un'email con le istruzioni per cambiare la tua passw
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
-msgstr "Impossibile inviare l'email di recupero password perchè il tuo nome utente è inattivo o il tuo account email non è stato verificato."
+msgstr "Impossibile inviare l'email di recupero password perchè il tuo nome utente è inattivo o il tuo indirizzo email non è stato verificato."
 
 #: mediagoblin/auth/views.py:285
 msgid "Couldn't find someone with that username or email."
-msgstr "Impossibile trovare qualcuno con questo username o password."
+msgstr "Impossibile trovare qualcuno con questo nome utente o password."
 
 #: mediagoblin/auth/views.py:333
 msgid "You can now log in using your new password."
-msgstr "Ora puoi effettuare il login con la nuova password."
+msgstr "Ora puoi effettuare l'accesso con la nuova password."
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr "Titolo"
 
@@ -103,12 +106,13 @@ msgid "Description of this work"
 msgstr "Descrizione di questo lavoro"
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
-msgstr ""
+msgstr "Puoi usare il\n                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n                      Markdown</a> per la formattazione."
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
@@ -118,11 +122,11 @@ msgstr "Tags"
 msgid "Separate tags by commas."
 msgstr "Separa le tags con la virgola."
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr ""
 
@@ -130,7 +134,7 @@ msgstr ""
 msgid ""
 "The title part of this media's address. You usually don't need to change "
 "this."
-msgstr "Il titolo è parte dell'indirizzo del contenuto. Nella maggior parte dei casi non c'è bisogno di cambiarlo."
+msgstr "Il titolo è parte dell'indirizzo del file. Nella maggior parte dei casi non c'è bisogno di cambiarlo."
 
 #: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
 #: mediagoblin/templates/mediagoblin/utils/license.html:20
@@ -139,7 +143,7 @@ msgstr "Licenza"
 
 #: mediagoblin/edit/forms.py:50
 msgid "Bio"
-msgstr "Bio"
+msgstr "Biografia"
 
 #: mediagoblin/edit/forms.py:56
 msgid "Website"
@@ -147,7 +151,7 @@ msgstr "Sito web"
 
 #: mediagoblin/edit/forms.py:58
 msgid "This address contains errors"
-msgstr ""
+msgstr "Questo indirizzo contiene errori"
 
 #: mediagoblin/edit/forms.py:63
 msgid "Old password"
@@ -163,32 +167,60 @@ msgstr "Nuova password"
 
 #: mediagoblin/edit/forms.py:72
 msgid "Email me when others comment on my media"
+msgstr "Inviami messaggi email quando altre persone commentano i miei files multimediali"
+
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
 msgstr ""
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
-msgstr "Stai modificando documenti multimediale di un altro utente. Procedi con attenzione."
+msgstr "Stai modificando files multimediali di un altro utente. Procedi con attenzione."
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Stai modificando il profilo di un utente. Procedi con attenzione."
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr "Cambiamenti del profilo salvati"
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr "Impostazioni del profilo salvate"
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr "Password errata"
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr ""
@@ -208,23 +240,99 @@ msgstr "Mi dispiace, non supporto questo tipo di file :("
 
 #: mediagoblin/media_types/video/processing.py:35
 msgid "Video transcoding failed"
+msgstr "Transcodifica video fallita"
+
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
 msgstr ""
 
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
-msgstr "documento non valido come tipo multimediale."
+msgstr "File non valido per il tipo di file multimediale indicato."
 
 #: mediagoblin/submit/forms.py:26
 msgid "File"
-msgstr "Documento"
+msgstr "File"
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
-msgstr "Devi specificare un documento."
+msgstr "Devi specificare un file."
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
-msgstr "Evviva! "
+msgstr "Evviva! Caricato!"
+
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
@@ -246,7 +354,7 @@ msgstr "Se sei sicuro che l'indirizzo è corretto, forse la pagina che stai cerc
 
 #: mediagoblin/templates/mediagoblin/base.html:50
 msgid "MediaGoblin logo"
-msgstr "MediaGoblin logo"
+msgstr "Simbolo di MediaGoblin"
 
 #: mediagoblin/templates/mediagoblin/base.html:60
 msgid "Verify your email!"
@@ -254,36 +362,40 @@ msgstr "Verifica la tua email!"
 
 #: mediagoblin/templates/mediagoblin/base.html:66
 msgid "+ Add media"
-msgstr ""
+msgstr "+ Aggiungi files multimediali"
 
-#: mediagoblin/templates/mediagoblin/base.html:68
-msgid "View your profile"
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/base.html:69
+msgid "View your profile"
+msgstr "Vedi il tuo profilo"
+
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
-msgstr ""
+msgstr "Esci"
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:75
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr "Accedi"
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
-msgstr ""
+msgstr "Realizzato con <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un progetto <a href=\"http://gnu.org/\">GNU</a>."
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
 "href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
 "href=\"%(source_link)s\">Source code</a> available."
-msgstr ""
+msgstr "Rilasciato con licenza <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a href=\"%(source_link)s\">Codice sorgente</a> disponibile."
 
 #: mediagoblin/templates/mediagoblin/root.html:24
 msgid "Explore"
@@ -291,19 +403,19 @@ msgstr "Esplora"
 
 #: mediagoblin/templates/mediagoblin/root.html:26
 msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "Ciao, benvenuto a questo sito MediaGoblin!"
+msgstr "Ciao, benvenuto in questo sito MediaGoblin!"
 
 #: mediagoblin/templates/mediagoblin/root.html:28
 msgid ""
 "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
 "extraordinarily great piece of media hosting software."
-msgstr "questo sito sta utilizzando <a href=\"http://mediagoblin.org\">Mediagoblin</a>, un ottimo programma di media hosting."
+msgstr "Questo sito sta utilizzando <a href=\"http://mediagoblin.org\">Mediagoblin</a>, un ottimo programma per caricare e condividere files multimediali."
 
 #: mediagoblin/templates/mediagoblin/root.html:29
 msgid ""
 "To add your own media, place comments, and more, you can log in with your "
 "MediaGoblin account."
-msgstr ""
+msgstr "Per aggiungere i tuoi file multimediali, scrivere commenti e altro puoi accedere con il tuo account MediaGoblin."
 
 #: mediagoblin/templates/mediagoblin/root.html:31
 msgid "Don't have one yet? It's easy!"
@@ -315,38 +427,38 @@ msgid ""
 "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n"
 "        or\n"
 "        <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>"
-msgstr ""
+msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Crea un account in questo sito</a>\n        oppure\n        <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Installa MediaGoblin sul tuo server</a>"
 
 #: mediagoblin/templates/mediagoblin/root.html:40
 msgid "Most recent media"
-msgstr "Documenti multimediali più recenti"
+msgstr "Files multimediali più recenti"
 
 #: mediagoblin/templates/mediagoblin/admin/panel.html:21
 #: mediagoblin/templates/mediagoblin/admin/panel.html:26
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26
 msgid "Media processing panel"
-msgstr "Pannello di elaborazione media"
+msgstr "Pannello di elaborazione files multimediali"
 
 #: mediagoblin/templates/mediagoblin/admin/panel.html:29
 msgid ""
 "Here you can track the state of media being processed on this instance."
-msgstr ""
+msgstr "Qui è possibile tenere traccia dello stato dei file multimediali in fase di elaborazione in questa istanza."
 
 #: mediagoblin/templates/mediagoblin/admin/panel.html:32
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
 msgid "Media in-processing"
-msgstr "Media in elaborazione"
+msgstr "Files multimediali in elaborazione"
 
 #: mediagoblin/templates/mediagoblin/admin/panel.html:58
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
 msgid "No media in-processing"
-msgstr "Nessun documento multimediale in elaborazione"
+msgstr "Nessun file multimediale in elaborazione"
 
 #: mediagoblin/templates/mediagoblin/admin/panel.html:61
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59
 msgid "These uploads failed to process:"
-msgstr "L'elaborazione di questi upload è fallita:"
+msgstr "L'elaborazione di questi files caricati è fallita:"
 
 #: mediagoblin/templates/mediagoblin/admin/panel.html:90
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
@@ -355,7 +467,7 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/admin/panel.html:92
 msgid "Last 10 successful uploads"
-msgstr ""
+msgstr "Ultimi 10 caricamenti riusciti"
 
 #: mediagoblin/templates/mediagoblin/admin/panel.html:112
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
@@ -392,7 +504,7 @@ msgid ""
 "\n"
 "If you think this is an error, just ignore this email and continue being\n"
 "a happy goblin!"
-msgstr "Ciao %(username)s,\nper cambiare la tua password MediaGoblin apri il seguente URL\nnel tuo web browser:\n\n%(verification_url)s\n\nSe pensi che sia un errore, ignora semplicemente questa email e continua ad essere \nun goblin felice!"
+msgstr "Ciao %(username)s,\n\nper cambiare la tua password MediaGoblin apri il seguente URL nel\ntuo browser web:\n\n%(verification_url)s\n\nSe pensi che questo sia un errore, ignora semplicemente questa email e continua ad essere \nun goblin felice!"
 
 #: mediagoblin/templates/mediagoblin/auth/login.html:39
 msgid "Logging in failed!"
@@ -408,7 +520,7 @@ msgstr "Creane uno qui!"
 
 #: mediagoblin/templates/mediagoblin/auth/login.html:51
 msgid "Forgot your password?"
-msgstr "Hai dimenticato la password?"
+msgstr "Hai dimenticato la tua password?"
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
 #: mediagoblin/templates/mediagoblin/auth/register.html:36
@@ -428,13 +540,13 @@ msgid ""
 "your web browser:\n"
 "\n"
 "%(verification_url)s"
-msgstr "Ciao %(username)s,\n\nper attivare il tuo account GNU MediaGoblin, apri il seguente URL nel tuo navigatore web.\n\n%(verification_url)s"
+msgstr "Ciao %(username)s,\n\nper attivare il tuo account GNU MediaGoblin, apri il seguente URL nel \ntuo navigatore web.\n\n%(verification_url)s"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:23
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:35
 #, python-format
 msgid "Editing attachments for %(media_title)s"
-msgstr ""
+msgstr "Stai modificando gli allegati di %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit.html:35
@@ -443,12 +555,17 @@ msgid "Editing %(media_title)s"
 msgstr "Stai modificando %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr "Annulla"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:43
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr "Salva i cambiamenti"
@@ -457,7 +574,12 @@ msgstr "Salva i cambiamenti"
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
 #, python-format
 msgid "Changing %(username)s's account settings"
-msgstr "Cambio le impostazione dell'account %(username)s"
+msgstr "Stai cambiando le impostazioni dell'account di %(username)s"
+
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
@@ -465,18 +587,20 @@ msgstr "Cambio le impostazione dell'account %(username)s"
 msgid "Editing %(username)s's profile"
 msgstr "Stai modificando il profilo di %(username)s"
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
 msgid "Media tagged with: %(tag_name)s"
-msgstr "file taggato con:%(tag_name)s"
+msgstr "File taggato con: %(tag_name)s"
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
 #: mediagoblin/templates/mediagoblin/media_displays/image.html:23
 #: mediagoblin/templates/mediagoblin/media_displays/video.html:52
 msgid "Download"
-msgstr ""
+msgstr "Scarica"
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
 #: mediagoblin/templates/mediagoblin/media_displays/image.html:27
@@ -488,72 +612,126 @@ msgid ""
 "Sorry, this audio will not work because \n"
 "\tyour web browser does not support HTML5 \n"
 "\taudio."
-msgstr ""
+msgstr "Spiacente ma è impossibile leggere questo file audio perché\n\til tuo browser web non supporta l'HTML5 \n\taudio."
 
 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
 msgid ""
 "You can get a modern web browser that \n"
 "\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
 "\t  http://getfirefox.com</a>!"
-msgstr ""
+msgstr "Puoi scaricare un browser web moderno,\n\t  in grado di leggere questo file audio, qui <a href=\"http://getfirefox.com\">\n\t  http://getfirefox.com</a>!"
 
 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/video.html:56
 msgid "Original file"
-msgstr ""
+msgstr "File originario"
 
 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
 msgid "WebM file (Vorbis codec)"
-msgstr ""
+msgstr "File WebM (codec Vorbis)"
 
 #: mediagoblin/templates/mediagoblin/media_displays/video.html:40
 msgid ""
 "Sorry, this video will not work because \n"
 "\t    your web browser does not support HTML5 \n"
 "\t    video."
-msgstr ""
+msgstr "Spiacente ma è impossibile visualizzare questo video perché\n\t    il tuo browser web non supporta l'HTML5 \n\t    video."
 
 #: mediagoblin/templates/mediagoblin/media_displays/video.html:43
 msgid ""
 "You can get a modern web browser that \n"
 "\t    can play this video at <a href=\"http://getfirefox.com\">\n"
 "\t    http://getfirefox.com</a>!"
-msgstr ""
+msgstr "Puoi scaricare un browser web moderno,\n\t    in grado di visualizzare questo video, qui <a href=\"http://getfirefox.com\">\n\t    http://getfirefox.com</a>!"
 
 #: mediagoblin/templates/mediagoblin/media_displays/video.html:59
 msgid "WebM file (640p; VP8/Vorbis)"
+msgstr "File WebM (640p; VP8/Vorbis)"
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+msgid "Add"
+msgstr "Aggiungi"
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
-msgstr "Aggiungi il tuo contenuto"
+msgstr "Aggiungi il tuo file multimediale"
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-msgid "Add"
-msgstr "Aggiungi"
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr "Modifica"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr "Elimina"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr "Vuoi davvero eliminare %(title)s?"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr "Elimina definitivamente"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
 #, python-format
 msgid ""
 "Hi %(username)s,\n"
 "%(comment_author)s commented on your post (%(comment_url)s) at %(instance_name)s\n"
-msgstr ""
+msgstr "Ciao %(username)s,\n%(comment_author)s ha commentato il tuo post (%(comment_url)s) su %(instance_name)s\n"
 
 #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
 #, python-format
 msgid "%(username)s's media"
-msgstr "file di %(username)s"
+msgstr "Files multimediali di %(username)s"
 
 #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
-msgstr "Documenti multimediali di <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr "Files multimediali di <a href=\"%(user_url)s\">%(username)s</a>"
 
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:46
 #, python-format
 msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
-msgstr ""
+msgstr "❖ Stai guardando i files multimediali di <a href=\"%(user_url)s\">%(username)s</a>"
 
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:67
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:73
@@ -561,24 +739,16 @@ msgstr ""
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr "Modifica"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr "Elimina"
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
-msgstr ""
+msgstr "Aggiungi un commento"
 
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:109
 msgid ""
 "You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
-msgstr ""
+msgstr "Puoi usare il <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> per la formattazione."
 
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:113
 msgid "Add this comment"
@@ -593,34 +763,38 @@ msgstr "a"
 msgid ""
 "<h3>Added on</h3>\n"
 "      <p>%(date)s</p>"
-msgstr ""
+msgstr "<h3>Aggiunto il</h3>\n      <p>%(date)s</p>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
-msgstr ""
+msgstr "Allegati"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
-msgstr ""
+msgstr "Aggiungi allegato"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
-msgstr "Vuoi davvero cancellare %(title)s?"
+msgid "Add %(title)s to collection"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
 msgid ""
 "You can track the state of media being processed for your gallery here."
-msgstr "Puoi seguire lo stato dell'elaborazione per la tua galleria qui."
+msgstr "Puoi controllare lo stato dei files multimediali in elaborazione per la tua galleria qui."
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
 msgid "Your last 10 successful uploads"
-msgstr ""
+msgstr "I tuoi ultimi 10 caricamenti riusciti"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:31
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:89
@@ -630,12 +804,12 @@ msgstr "profilo di %(username)s"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:43
 msgid "Sorry, no such user found."
-msgstr "Mi dispiace, utente non trovato"
+msgstr "Mi dispiace, utente non trovato."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:50
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:70
 msgid "Email verification needed"
-msgstr "è necessario verificare email"
+msgstr "E' necessario verificare l'indirizzo email"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:53
 msgid "Almost done! Your account still needs to be activated."
@@ -665,7 +839,7 @@ msgstr "Qualcuno ha registrato un account con questo nome utente, ma deve ancora
 msgid ""
 "If you are that person but you've lost your verification email, you can <a "
 "href=\"%(login_url)s\">log in</a> and resend it."
-msgstr "Se sei quella persona ma hai perso l'email di verifica, puoi <a href=\"%(login_url)s\">accedere</a> e rispedirlo."
+msgstr "Se sei quella persona ma hai perso l'email di verifica, puoi <a href=\"%(login_url)s\">accedere</a> e rispedirla."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:96
 msgid "Here's a spot to tell others about yourself."
@@ -687,22 +861,40 @@ msgstr "Cambia le impostazioni dell'account"
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:138
 #, python-format
 msgid "View all of %(username)s's media"
-msgstr "Visualizza tutti i file multimediali di %(username)s"
+msgstr "Visualizza tutti i files multimediali di %(username)s"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:151
 msgid ""
 "This is where your media will appear, but you don't seem to have added "
 "anything yet."
-msgstr "Questo è dove i tuoi documenti multimediali appariranno, ma sembra che tu non abbia ancora aggiunto niente."
+msgstr "Qui è dove appariranno i tuoi files multimediali, ma sembra che tu non abbia ancora aggiunto niente."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:157
 msgid "Add media"
-msgstr "Aggiungi documenti multimediali"
+msgstr "Aggiungi files multimediali"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
-msgstr "Non sembra ci sia ancora nessun documento multimediali qui.."
+msgstr "Sembra che non ci sia ancora nessun file multimediale qui..."
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
@@ -714,12 +906,12 @@ msgstr "Atom feed"
 
 #: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
 msgid "Location"
-msgstr ""
+msgstr "Posizione"
 
 #: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
-msgstr ""
+msgstr "Visualizza su <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 
 #: mediagoblin/templates/mediagoblin/utils/license.html:25
 msgid "All rights reserved"
@@ -749,41 +941,100 @@ msgstr "più vecchio"
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
 msgid "Tagged with"
-msgstr ""
+msgstr "Taggato con"
 
 #: mediagoblin/tools/exif.py:78
 msgid "Could not read the image file."
-msgstr "Non è possibile leggere il file dell'immagine"
+msgstr "Impossibile leggere il file immagine."
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
-msgstr "Sono sicuro di volerlo cancellare"
+msgstr "Sono sicuro di volerlo eliminare"
+
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
 
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
-msgstr ""
+msgstr "ha commentato il tuo post"
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr "Oops, il tuo commento era vuoto."
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr "Il tuo commento è stato aggiunto!"
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
-msgstr "Hai cancellato il file"
+msgstr "Hai eliminato il file."
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Il file non è stato eliminato perchè non hai confermato di essere sicuro."
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
-msgstr "Stai cancellando un documento multimediale di un altro utente. Procedi con attenzione."
+msgstr "Stai eliminando un file multimediale di un altro utente. Procedi con attenzione."
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo
index 2177b7dd19c70ff199d70d6c7b0e836dad8208f1..274f98fc295ae87d29650e943ba346ec53727803 100644 (file)
Binary files a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po
index a6207eca3806aea5f5d8bdecb4baff96f358b123..e77e0c2522d8b6d58bb21ac55d4b33f46a196a71 100644 (file)
--- a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-19 14:21-0500\n"
-"PO-Revision-Date: 2012-08-19 19:21+0000\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: ja\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -92,7 +92,9 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr "タイトル"
 
@@ -101,7 +103,8 @@ msgid "Description of this work"
 msgstr ""
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -116,11 +119,11 @@ msgstr "タグ"
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr "スラグ"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr "スラグは必要です。"
 
@@ -163,30 +166,58 @@ msgstr ""
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr "そのスラグを持つエントリは、このユーザーは既に存在します。"
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "あなたは、他のユーザーのメディアを編集しています。ご注意ください。"
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "あなたは、他のユーザーのプロファイルを編集しています。ご注意ください。"
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr ""
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr ""
@@ -208,6 +239,72 @@ msgstr ""
 msgid "Video transcoding failed"
 msgstr ""
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr ""
@@ -216,14 +313,24 @@ msgstr ""
 msgid "File"
 msgstr "ファイル"
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "ファイルを提供する必要があります。"
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr "投稿終了！"
 
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr ""
@@ -254,28 +361,32 @@ msgstr ""
 msgid "+ Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:68
-msgid "View your profile"
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/base.html:69
+msgid "View your profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:75
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr "ログイン"
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -441,12 +552,17 @@ msgid "Editing %(media_title)s"
 msgstr "%(media_title)sを編集中"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr "キャンセル"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:43
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr "投稿する"
@@ -457,12 +573,19 @@ msgstr "投稿する"
 msgid "Changing %(username)s's account settings"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr "%(username)sさんのプロフィールを編集中"
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -522,13 +645,67 @@ msgstr ""
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+msgid "Add"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-msgid "Add"
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
@@ -559,14 +736,6 @@ msgstr ""
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr ""
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr ""
@@ -593,22 +762,26 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
+msgid "Add %(title)s to collection"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
@@ -698,10 +871,28 @@ msgid "Add media"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr ""
@@ -753,35 +944,94 @@ msgstr ""
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr ""
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo
index 0371863b40b0d2267b2d1ebbb009b65be2d4d2c4..2f644dc40e39480e42cb5c2ed8c8411afbbc50bc 100644 (file)
Binary files a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po
index 16ddef8a7f35bd095e05c367aefebf19eb7146fd..71fb1daaa48fcd186308e6ea41cacfb2fa327529 100644 (file)
--- a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-19 14:21-0500\n"
-"PO-Revision-Date: 2012-08-19 19:21+0000\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: nl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -93,7 +93,9 @@ msgstr "Kon niemand vinden met die gebruikersnaam of dat e-mailadres."
 msgid "You can now log in using your new password."
 msgstr "Je kunt nu inloggen met je nieuwe wachtwoord."
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr "Titel"
 
@@ -102,7 +104,8 @@ msgid "Description of this work"
 msgstr "Beschrijving van dit werk"
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -117,11 +120,11 @@ msgstr "Etiket"
 msgid "Separate tags by commas."
 msgstr "Hou labels gescheiden met komma's."
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr "Slug"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr "De slug kan niet leeg zijn"
 
@@ -164,30 +167,58 @@ msgstr "Nieuw wachtwoord"
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr "Er bestaat al een met die slug voor deze gebruiker."
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "U bent de media van een andere gebruiker aan het aanpassen. Ga voorzichtig te werk."
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "U bent een gebruikersprofiel aan het aanpassen. Ga voorzichtig te werk."
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr "Profielaanpassingen opgeslagen"
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr "Accountinstellingen opgeslagen"
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr "Verkeerd wachtwoord"
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr ""
@@ -209,6 +240,72 @@ msgstr "Sorry, dat bestandstype wordt niet ondersteunt."
 msgid "Video transcoding failed"
 msgstr ""
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr "Verkeerd bestandsformaat voor mediatype opgegeven."
@@ -217,14 +314,24 @@ msgstr "Verkeerd bestandsformaat voor mediatype opgegeven."
 msgid "File"
 msgstr "Bestand"
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "U moet een bestand aangeven."
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr "Mooizo! Toegevoegd!"
 
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr "Afbeelding van de 404 goblin onder stress"
@@ -255,28 +362,32 @@ msgstr "Verifieer je e-mailadres!"
 msgid "+ Add media"
 msgstr "+ Media toevoegen"
 
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "View your profile"
 msgstr "Profiel weergeven"
 
-#: mediagoblin/templates/mediagoblin/base.html:69
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr "Afmelden"
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:75
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr "Inloggen"
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr "Hier draait <a href=\"http://mediagoblin.org\">MediaGoblin</a>, een <a href=\"http://gnu.org/\">GNU</a> project."
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -442,12 +553,17 @@ msgid "Editing %(media_title)s"
 msgstr "%(media_title)s aanpassen"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr "Annuleren"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:43
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr "Wijzigingen opslaan"
@@ -458,12 +574,19 @@ msgstr "Wijzigingen opslaan"
 msgid "Changing %(username)s's account settings"
 msgstr "%(username)ss accountinstellingen aanpassen"
 
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr "Het profiel aanpassen van %(username)s"
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -523,14 +646,68 @@ msgstr "Je kunt een moderne webbrowser die deze video af kan spelen krijgen op <
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+msgid "Add"
+msgstr "Voeg toe"
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
 msgstr "Voeg media toe"
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-msgid "Add"
-msgstr "Voeg toe"
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr "Pas aan"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr "Zeker weten dat je %(title)s wil verwijderen?"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr "Permanent verwijderen"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
 #, python-format
@@ -560,14 +737,6 @@ msgstr "❖ Blader door media van <a href=\"%(user_url)s\">%(username)s</a>"
 msgid "Image for %(media_title)s"
 msgstr "Afbeelding voor %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr "Pas aan"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr "Verwijderen"
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr "Geef een reactie"
@@ -594,23 +763,27 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr "<h3>Toegevoegd op</h3>\n      <p>%(date)s</p>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
-msgstr "Zeker weten dat je %(title)s wil verwijderen?"
+msgid "Add %(title)s to collection"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
-msgstr "Permanent verwijderen"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
 msgid ""
@@ -699,10 +872,28 @@ msgid "Add media"
 msgstr "Voeg media toe"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr "Het lijkt erop dat er nog geen media is."
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr "feed icoon"
@@ -754,35 +945,94 @@ msgstr "Getagged met"
 msgid "Could not read the image file."
 msgstr "Kon het afbeeldingsbestand niet lezen."
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr "Ik weet zeker dat ik dit wil verwijderen."
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr "Oeps, je bericht was leeg."
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr "Je bericht is geplaatst!"
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr "Je hebt deze media verwijderd."
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Deze media was niet verwijderd omdat je niet hebt aangegeven dat je het zeker weet."
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Je staat op het punt de media van iemand anders te verwijderen. Pas op."
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo
index 08cd84f373cfcbad1e784b36db5758978091ca59..bb73e8d322dc968661de90b439ca2ad4508ee2d1 100644 (file)
Binary files a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
index 3e37f34d75dbcf6668e993755ea21ee2d9818d72..89f12e453399350553ae439b0600ea0c06f97206 100644 (file)
--- a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-19 14:21-0500\n"
-"PO-Revision-Date: 2012-08-19 19:21+0000\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/mediagoblin/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: nn_NO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -92,7 +92,9 @@ msgstr "Fann ingen med det brukarnamnet eller passordet."
 msgid "You can now log in using your new password."
 msgstr "Du kan no logga inn med det nye passordet ditt."
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr "Tittel"
 
@@ -101,7 +103,8 @@ msgid "Description of this work"
 msgstr "Skildring av mediefila"
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -116,11 +119,11 @@ msgstr "Merkelappar"
 msgid "Separate tags by commas."
 msgstr "Separer merkelappar med komma."
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr "Nettnamn"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr "Nettnamnet kan ikkje vera tomt"
 
@@ -163,30 +166,58 @@ msgstr "Nytt passord"
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr "Eit innlegg med denne adressetittelen finst allereie."
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Trå varsamt, du endrar nokon andre sine mediefiler."
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Trå varsamt, du endrar nokon andre sin profil."
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr "Lagra endring av profilen"
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr "Lagra kontoinstellingar"
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr "Feil passord"
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr ""
@@ -208,6 +239,72 @@ msgstr "Orsak, stør ikkje den filtypen :("
 msgid "Video transcoding failed"
 msgstr ""
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr "Ugyldig fil for mediatypen."
@@ -216,14 +313,24 @@ msgstr "Ugyldig fil for mediatypen."
 msgid "File"
 msgstr "Fil"
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Du må velja ei fil."
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr "Johoo! Opplasta!"
 
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr "Bilete av stressa 404-tusse."
@@ -254,28 +361,32 @@ msgstr "Verifiser epostadressa di."
 msgid "+ Add media"
 msgstr "+ Legg til medie"
 
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "View your profile"
 msgstr "Sjå profilen din"
 
-#: mediagoblin/templates/mediagoblin/base.html:69
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr "Logg ut"
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:75
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr "Logg inn"
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr "Drive av <a href=\"http://mediagoblin.org\">MediaGoblin</a>, eit <a href=\"http://gnu.org/\">GNU</a>-prosjekt."
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -441,12 +552,17 @@ msgid "Editing %(media_title)s"
 msgstr "Endrar %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr "Bryt av"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:43
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr "Lagra"
@@ -457,12 +573,19 @@ msgstr "Lagra"
 msgid "Changing %(username)s's account settings"
 msgstr "Endrar kontoinnstellingane til %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr "Endrar profilen til %(username)s"
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -522,14 +645,68 @@ msgstr "Du kan skaffa ein moderne netlesar som kan spela av denne videoen hjå <
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+msgid "Add"
+msgstr "Legg til"
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
 msgstr "Legg til mediefiler"
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-msgid "Add"
-msgstr "Legg til"
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr "Endra"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr "Slett"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr "Vil du verkeleg sletta %(title)s?"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr "Slett permanent"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
 #, python-format
@@ -559,14 +736,6 @@ msgstr "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgid "Image for %(media_title)s"
 msgstr "Bilete for %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr "Endra"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr "Slett"
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr "Legg att innspel"
@@ -593,23 +762,27 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr "<h3>Lagt til</h3>\n      <p>%(date)s</p>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
-msgstr "Vil du verkeleg sletta %(title)s?"
+msgid "Add %(title)s to collection"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
-msgstr "Slett permanent"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
 msgid ""
@@ -698,10 +871,28 @@ msgid "Add media"
 msgstr "Legg til mediefiler"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr "Ser ikkje ut til at det finst nokon mediefiler her nett no."
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr " "
@@ -753,35 +944,94 @@ msgstr "Merka med"
 msgid "Could not read the image file."
 msgstr "Klarte ikkje lesa biletefila."
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr "Eg er sikker eg vil sletta dette"
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr "Vops, innspelet ditt var tomt."
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr "Innspelet ditt er lagt til."
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr "Du sletta fila."
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Sletta ikkje fila fordi du ikkje sa du var sikker."
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Du er i ferd med å sletta ein annan brukar sine mediefiler. Trå varsamt."
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.mo
index 41738dfca908afac5585112f48b8876e938176e5..ed562ebc81f0ccbd331b939686ff8da91505f9ff 100644 (file)
Binary files a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po
index 4ba30d3892b410c059aa3175ab4b4cd19ac0e99e..e23d5da31ba6ea556c8acb478c25bc740c22b11f 100644 (file)
--- a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-19 14:21-0500\n"
-"PO-Revision-Date: 2012-08-19 19:21+0000\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -92,7 +92,9 @@ msgstr "Nie znaleziono nikogo o takiej nazwie użytkownika lub adresie e-mail."
 msgid "You can now log in using your new password."
 msgstr "Teraz możesz się zalogować używając nowe hasło."
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr "Tytuł"
 
@@ -101,7 +103,8 @@ msgid "Description of this work"
 msgstr "Opis tej pracy"
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -116,11 +119,11 @@ msgstr "Znaczniki"
 msgid "Separate tags by commas."
 msgstr "Rozdzielaj znaczniki przecinkami."
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr "Slug"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr "Slug nie może być pusty"
 
@@ -163,30 +166,58 @@ msgstr "Nowe hasło"
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr "Adres z tym slugiem dla tego użytkownika już istnieje."
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Edytujesz media innego użytkownika. Zachowaj ostrożność."
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Edytujesz profil innego użytkownika. Zachowaj ostrożność."
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr "Zapisano zmiany profilu"
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr "Zapisano ustawienia konta"
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr "Nieprawidłowe hasło"
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr ""
@@ -208,6 +239,72 @@ msgstr "NIestety, nie obsługujemy tego typu plików :-("
 msgid "Video transcoding failed"
 msgstr ""
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr "Niewłaściwy plik dla tego rodzaju mediów."
@@ -216,14 +313,24 @@ msgstr "Niewłaściwy plik dla tego rodzaju mediów."
 msgid "File"
 msgstr "Plik"
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Musisz podać plik."
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr "Hura! Wysłano!"
 
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr "Grafika zestresowanego goblina 404."
@@ -254,28 +361,32 @@ msgstr "Zweryfikuj swój adres e-mail!"
 msgid "+ Add media"
 msgstr "+ Dodaj media"
 
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "View your profile"
 msgstr "Zobacz swój profil"
 
-#: mediagoblin/templates/mediagoblin/base.html:69
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr "Wyloguj się"
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:75
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr "Zaloguj się"
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr "Obsługiwane przez <a href=\"http://mediagoblin.org\">MediaGoblin</a>, projekt <a href=\"http://gnu.org/\">GNU</a>."
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -441,12 +552,17 @@ msgid "Editing %(media_title)s"
 msgstr "Edytowanie %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr "Anuluj"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:43
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr "Zapisz zmiany"
@@ -457,12 +573,19 @@ msgstr "Zapisz zmiany"
 msgid "Changing %(username)s's account settings"
 msgstr "Zmiana ustawień konta %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr "Edycja profilu %(username)s"
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -522,14 +645,68 @@ msgstr "Możesz pobrać współczesną przeglądarkę, która obsługuje \n\t
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+msgid "Add"
+msgstr "Dodaj"
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
 msgstr "Dodaj swoje media"
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-msgid "Add"
-msgstr "Dodaj"
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr "Edytuj"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr "Usuń"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr "Na pewno usunąć %(title)s?"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr "Usuń na stałe"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
 #, python-format
@@ -559,14 +736,6 @@ msgstr "❖ Przeglądanie mediów użytkownika <a href=\"%(user_url)s\">%(userna
 msgid "Image for %(media_title)s"
 msgstr "Grafika dla %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr "Edytuj"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr "Usuń"
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr "Dodaj komentarz"
@@ -593,23 +762,27 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr "<h3>Dodane</h3>\n      <p>%(date)s</p>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
-msgstr "Na pewno usunąć %(title)s?"
+msgid "Add %(title)s to collection"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
-msgstr "Usuń na stałe"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
 msgid ""
@@ -698,10 +871,28 @@ msgid "Add media"
 msgstr "Dodaj media"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr "Tu nie ma jeszcze żadnych mediów..."
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr "ikona kanału"
@@ -753,35 +944,94 @@ msgstr "Znaczniki:"
 msgid "Could not read the image file."
 msgstr "Nie udało się odczytać pliku grafiki."
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr "Na pewno chcę to usunąć"
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr "Ups, twój komentarz nie zawierał treści."
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr "Twój komentarz został opublikowany!"
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr "Media zostały usunięte."
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Media nie zostały usunięte ponieważ nie potwierdziłeś, że jesteś pewien."
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Za chwilę usuniesz media innego użytkownika. Zachowaj ostrożność."
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo
index 214da6baab65a4e757ea19969fe897ff4a7e79c6..11831594b5bf10449dfd3d3f3d08fde3b28e3b97 100644 (file)
Binary files a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po
index fcca26b3e8a82a043e12b768e0e921cff44b7e89..403f65ecbac7e2936cb3504f16fde09de40a1807 100644 (file)
--- a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-19 14:21-0500\n"
-"PO-Revision-Date: 2012-08-19 19:21+0000\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/mediagoblin/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -93,7 +93,9 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr "Título"
 
@@ -102,7 +104,8 @@ msgid "Description of this work"
 msgstr "Descrição desse trabalho"
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -117,11 +120,11 @@ msgstr "Etiquetas"
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr "Arquivo"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr "O arquivo não pode estar vazio"
 
@@ -164,30 +167,58 @@ msgstr ""
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr "Uma entrada com esse arquivo já existe para esse usuário"
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Você está editando a mídia de outro usuário. Tenha cuidado."
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Você está editando um perfil de usuário. Tenha cuidado."
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr "Senha errada"
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr ""
@@ -209,6 +240,72 @@ msgstr ""
 msgid "Video transcoding failed"
 msgstr ""
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr "Arquivo inválido para esse tipo de mídia"
@@ -217,14 +314,24 @@ msgstr "Arquivo inválido para esse tipo de mídia"
 msgid "File"
 msgstr "Arquivo"
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Você deve fornecer um arquivo."
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr "Eba! Enviado!"
 
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr "Imagem do goblin 404 aparecendo"
@@ -255,28 +362,32 @@ msgstr "Verifique seu email!"
 msgid "+ Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:68
-msgid "View your profile"
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/base.html:69
+msgid "View your profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:75
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr "Entrar"
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -442,12 +553,17 @@ msgid "Editing %(media_title)s"
 msgstr "Editando %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:43
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr "Salvar mudanças"
@@ -458,12 +574,19 @@ msgstr "Salvar mudanças"
 msgid "Changing %(username)s's account settings"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr "Editando perfil de %(username)s"
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -523,13 +646,67 @@ msgstr ""
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+msgid "Add"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-msgid "Add"
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr "Editar"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr "Apagar"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr "Realmente apagar %(title)s ?"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
@@ -560,14 +737,6 @@ msgstr ""
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr "Editar"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr "Apagar"
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr ""
@@ -594,22 +763,26 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
-msgstr "Realmente apagar %(title)s ?"
+msgid "Add %(title)s to collection"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
@@ -699,10 +872,28 @@ msgid "Add media"
 msgstr "Adicionar mídia"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr "Aparentemente não há nenhuma mídia aqui ainda..."
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr "ícone feed"
@@ -754,35 +945,94 @@ msgstr ""
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr "Eu tenho certeza de que quero pagar isso"
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr "Opa, seu comentáio estava vazio."
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr "Seu comentário foi postado!"
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr "Você deletou a mídia."
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Você vai apagar uma mídia de outro usuário. Tenha cuidado."
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo
index 0f8a186f13356f4b9dc8a842d7da43263fc0efee..7f5aef70c65820788cb71cc83338ad5e85426136 100644 (file)
Binary files a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po
index 4bc2f4137ee46cbc0b195544a8944a94e0cb4eec..1cb0db097b3a169f18eddf22fe9a339f97e97aa3 100644 (file)
--- a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po
@@ -9,16 +9,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-05 10:01-0500\n"
-"PO-Revision-Date: 2012-08-05 15:42+0000\n"
-"Last-Translator: George Pop <gapop@hotmail.com>\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
+"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/mediagoblin/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -93,7 +93,9 @@ msgstr "Nu s-a găsit nicio persoană cu acel nume de utilizator sau adresă de
 msgid "You can now log in using your new password."
 msgstr "Acum te poți autentifica cu noua parolă."
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr "Titlu"
 
@@ -102,7 +104,8 @@ msgid "Description of this work"
 msgstr "Descrierea acestui fișier"
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -117,11 +120,11 @@ msgstr "Tag-uri"
 msgid "Separate tags by commas."
 msgstr "Desparte tag-urile prin virgulă."
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr "Identificator"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr "Identificatorul nu poate să lipsească"
 
@@ -164,30 +167,58 @@ msgstr "Noua parolă"
 msgid "Email me when others comment on my media"
 msgstr "Trimite-mi un e-mail când alții comentează fișierele mele"
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr "Există deja un entry cu același identificator pentru acest utilizator."
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Editezi fișierul unui alt utilizator. Se recomandă prudență."
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Editezi profilul unui utilizator. Se recomandă prudență."
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr "Modificările profilului au fost salvate"
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr "Setările pentru acest cont au fost salvate"
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr "Parolă incorectă"
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr "Tema nu poate fi atașată... nu există o temă selectată\n"
@@ -209,6 +240,72 @@ msgstr "Scuze, nu recunosc acest tip de fișier :("
 msgid "Video transcoding failed"
 msgstr "Transcodarea video a eșuat"
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr "Formatul fișierului nu corespunde cu tipul de media selectat."
@@ -217,27 +314,37 @@ msgstr "Formatul fișierului nu corespunde cu tipul de media selectat."
 msgid "File"
 msgstr "Fișier"
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Trebuie să selectezi un fișier."
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr "Ura! Trimis!"
 
-#: mediagoblin/templates/mediagoblin/404.html:22
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr "Imagine cu elful 404 stresat."
 
-#: mediagoblin/templates/mediagoblin/404.html:23
+#: mediagoblin/templates/mediagoblin/404.html:25
 msgid "Oops!"
 msgstr "Hopa!"
 
-#: mediagoblin/templates/mediagoblin/404.html:24
+#: mediagoblin/templates/mediagoblin/404.html:26
 msgid "There doesn't seem to be a page at this address. Sorry!"
 msgstr "Nu există nicio pagină la această adresă. Ne pare rău!"
 
-#: mediagoblin/templates/mediagoblin/404.html:26
+#: mediagoblin/templates/mediagoblin/404.html:28
 msgid ""
 "If you're sure the address is correct, maybe the page you're looking for has"
 " been moved or deleted."
@@ -255,27 +362,32 @@ msgstr "Verifică adresa de e-mail!"
 msgid "+ Add media"
 msgstr "+ Adaugă fișier media"
 
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "View your profile"
 msgstr "Vezi profilul tău"
 
-#: mediagoblin/templates/mediagoblin/base.html:69
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr "Ieșire"
 
-#: mediagoblin/templates/mediagoblin/base.html:74
-#: mediagoblin/templates/mediagoblin/auth/login.html:32
-#: mediagoblin/templates/mediagoblin/auth/login.html:50
+#: mediagoblin/templates/mediagoblin/base.html:75
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr "Autentificare"
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr "Construit cu <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un proiect <a href=\"http://gnu.org/\">GNU</a>."
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -319,58 +431,62 @@ msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Creează
 msgid "Most recent media"
 msgstr "Cele mai recente fișiere"
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:22
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
+#: mediagoblin/templates/mediagoblin/admin/panel.html:21
+#: mediagoblin/templates/mediagoblin/admin/panel.html:26
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26
 msgid "Media processing panel"
 msgstr "Panou de procesare media"
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:25
+#: mediagoblin/templates/mediagoblin/admin/panel.html:29
 msgid ""
 "Here you can track the state of media being processed on this instance."
 msgstr "Aici poți urmări starea fișierelor aflate în curs de procesare pe acest server."
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:28
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:28
+#: mediagoblin/templates/mediagoblin/admin/panel.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
 msgid "Media in-processing"
 msgstr "Fișiere în curs de procesare"
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:54
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:52
+#: mediagoblin/templates/mediagoblin/admin/panel.html:58
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
 msgid "No media in-processing"
 msgstr "Niciun fișier în curs de procesare"
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:55
+#: mediagoblin/templates/mediagoblin/admin/panel.html:61
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59
 msgid "These uploads failed to process:"
 msgstr "Aceste fișiere nu au putut fi procesate:"
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:86
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:82
+#: mediagoblin/templates/mediagoblin/admin/panel.html:90
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
 msgid "No failed entries!"
 msgstr "Niciun entry cu erori!"
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:88
+#: mediagoblin/templates/mediagoblin/admin/panel.html:92
 msgid "Last 10 successful uploads"
 msgstr "Ultimele 10 upload-uri reușite"
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:108
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:103
+#: mediagoblin/templates/mediagoblin/admin/panel.html:112
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
 msgid "No processed entries, yet!"
 msgstr "Nu există încă niciun entry procesat!"
 
-#: mediagoblin/templates/mediagoblin/auth/change_fp.html:32
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
 msgid "Set your new password"
 msgstr "Stabilește noua parolă"
 
-#: mediagoblin/templates/mediagoblin/auth/change_fp.html:35
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39
 msgid "Set password"
 msgstr "Stabilește parola"
 
-#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31
 msgid "Recover password"
 msgstr "Recuperează parola"
 
-#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:30
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34
 msgid "Send instructions"
 msgstr "Trimite instrucțiuni"
 
@@ -388,27 +504,28 @@ msgid ""
 "a happy goblin!"
 msgstr "Bună, %(username)s\n\nPentru a schimba parola ta la GNU MediaGoblin, accesează adresa următoare:\n\n%(verification_url)s\n\nDacă ai primit acest mesaj din greșeală, ignoră-l și fii mai departe un elf fericit!"
 
-#: mediagoblin/templates/mediagoblin/auth/login.html:35
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
 msgid "Logging in failed!"
 msgstr "Autentificare eșuată!"
 
-#: mediagoblin/templates/mediagoblin/auth/login.html:40
+#: mediagoblin/templates/mediagoblin/auth/login.html:44
 msgid "Don't have an account yet?"
 msgstr "Nu ai un cont?"
 
-#: mediagoblin/templates/mediagoblin/auth/login.html:41
+#: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Create one here!"
 msgstr "Creează-l aici!"
 
-#: mediagoblin/templates/mediagoblin/auth/login.html:47
+#: mediagoblin/templates/mediagoblin/auth/login.html:51
 msgid "Forgot your password?"
 msgstr "Ai uitat parola?"
 
-#: mediagoblin/templates/mediagoblin/auth/register.html:32
+#: mediagoblin/templates/mediagoblin/auth/register.html:28
+#: mediagoblin/templates/mediagoblin/auth/register.html:36
 msgid "Create an account!"
 msgstr "Creează un cont!"
 
-#: mediagoblin/templates/mediagoblin/auth/register.html:36
+#: mediagoblin/templates/mediagoblin/auth/register.html:40
 msgid "Create"
 msgstr "Creează"
 
@@ -423,32 +540,53 @@ msgid ""
 "%(verification_url)s"
 msgstr "Bună, %(username)s,\n\npentru activarea contului tău la GNU MediaGoblin, accesează adresa următoare:\n\n%(verification_url)s"
 
-#: mediagoblin/templates/mediagoblin/edit/edit.html:29
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:23
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:35
+#, python-format
+msgid "Editing attachments for %(media_title)s"
+msgstr "Editare anexe la %(media_title)s"
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
 #, python-format
 msgid "Editing %(media_title)s"
 msgstr "Editare %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/edit/edit.html:36
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr "Anulare"
 
-#: mediagoblin/templates/mediagoblin/edit/edit.html:37
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
-#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
+#: mediagoblin/templates/mediagoblin/edit/edit.html:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr "Salvează modificările"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:34
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
 #, python-format
 msgid "Changing %(username)s's account settings"
 msgstr "Se modifică setările contului pentru userul %(username)s"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr "Editare profil %(username)s"
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -508,14 +646,69 @@ msgstr "Poți lua un browser modern\n<span class=\"whitespace other\" title=\"Ta
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr "Fișier WebM (640p; VP8/Vorbis)"
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:26
-msgid "Add your media"
-msgstr "Adaugă fișierele tale media"
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:30
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
 msgid "Add"
 msgstr "Adaugă"
 
+#: mediagoblin/templates/mediagoblin/submit/start.html:23
+#: mediagoblin/templates/mediagoblin/submit/start.html:30
+msgid "Add your media"
+msgstr "Adaugă fișierele tale media"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr "Editare"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr "Șterge"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr "Sigur dorești să ștergi %(title)s?"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr "Șterge definitiv"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
 #, python-format
 msgid ""
@@ -544,14 +737,6 @@ msgstr "<p>❖ Fișierele media ale lui <a href=\"%(user_url)s\">%(username)s</a
 msgid "Image for %(media_title)s"
 msgstr "Imagine pentru %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr "Editare"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr "Șterge"
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr "Adaugă un comentariu"
@@ -578,30 +763,34 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr "<h3>Adăugat la</h3>\n      <p>%(date)s</p>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr "Anexe"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr "Atașează"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
-msgstr "Sigur dorești să ștergi %(title)s?"
+msgid "Add %(title)s to collection"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
-msgstr "Șterge definitiv"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:25
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
 msgid ""
 "You can track the state of media being processed for your gallery here."
 msgstr "Aici poți urmări stadiul procesării fișierelor media din galeria ta."
 
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
 msgid "Your last 10 successful uploads"
 msgstr "Ultimele tale 10 upload-uri reușite"
 
@@ -683,10 +872,28 @@ msgid "Add media"
 msgstr "Trimite fișier"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr "Nu pare să existe niciun fișier media deocamdată..."
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr "icon feed"
@@ -738,35 +945,94 @@ msgstr "Etichete"
 msgid "Could not read the image file."
 msgstr "Fișierul cu imaginea nu a putut fi citit."
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr "Sunt sigur că doresc să șterg"
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr "a făcut un comentariu la postarea ta"
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr "Hopa, ai uitat să scrii comentariul."
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr "Comentariul tău a fost trimis!"
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr "Unele fișiere din acest entry par să lipsească.  Ștergem, totuși."
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr "Ai șters acest fișier"
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Fișierul nu a fost șters deoarece nu ai confirmat că ești sigur."
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Urmează să ștergi fișierele media ale unui alt utilizator. Se recomandă prudență."
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo
index 370b5ceb829d15d0c07bc50c6ed9e9e0d542c8cd..9d07c93b6564a1ac77bca0e92e2e8b5d7681d889 100644 (file)
Binary files a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po
index d15f0a1933acc85db2b5c53a66988adb7dfe20c7..0239823ff2e245cc4c6caf8a5e1af96d24b315e4 100644 (file)
--- a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po
@@ -8,16 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-19 14:21-0500\n"
-"PO-Revision-Date: 2012-08-21 14:18+0000\n"
-"Last-Translator: aleksejrs <deletesoftware@yandex.ru>\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
+"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -92,7 +92,9 @@ msgstr "Не найдено никого с таким именем пользо
 msgid "You can now log in using your new password."
 msgstr "Теперь вы можете войти, используя ваш новый пароль."
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr "Название"
 
@@ -101,7 +103,8 @@ msgid "Description of this work"
 msgstr "Описание этого произведения"
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -116,11 +119,11 @@ msgstr "Метки"
 msgid "Separate tags by commas."
 msgstr "(через запятую)"
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr "Отличительная часть адреса"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr "Отличительная часть адреса необходима"
 
@@ -163,30 +166,58 @@ msgstr "Новый пароль"
 msgid "Email me when others comment on my media"
 msgstr "Уведомлять меня по e-mail о комментариях к моим файлам"
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr "У этого пользователя уже есть файл с такой отличительной частью адреса."
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Вы редактируете файлы другого пользователя. Будьте осторожны."
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Вы редактируете профиль пользователя. Будьте осторожны."
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr "Изменения профиля сохранены"
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr "Настройки учётной записи записаны"
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr "Неправильный пароль"
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr "Невозможно привязать тему… не выбрано существующей темы\n"
@@ -208,6 +239,72 @@ msgstr "Увы, я не поддерживаю этот тип файлов :("
 msgid "Video transcoding failed"
 msgstr "Перекодировка видео не удалась"
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr "Неправильный формат файла."
@@ -216,14 +313,24 @@ msgstr "Неправильный формат файла."
 msgid "File"
 msgstr "Файл"
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Вы должны загрузить файл."
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr "Ура! Файл загружен!"
 
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr "Изображение 404 нервничающего гоблина"
@@ -254,28 +361,32 @@ msgstr "Подтвердите ваш адрес электронной почт
 msgid "+ Add media"
 msgstr "+ Добавить файл"
 
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "View your profile"
 msgstr "Посмотреть свой профиль"
 
-#: mediagoblin/templates/mediagoblin/base.html:69
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr "Завершение сеанса"
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:75
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr "Войти"
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr "Работает на <a href=\"http://mediagoblin.org\">MediaGoblin</a>, проекте <a href=\"http://gnu.org/\">GNU</a>."
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -441,12 +552,17 @@ msgid "Editing %(media_title)s"
 msgstr "Редактирование %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr "Отмена"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:43
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr "Сохранить изменения"
@@ -457,12 +573,19 @@ msgstr "Сохранить изменения"
 msgid "Changing %(username)s's account settings"
 msgstr "Настройка учётной записи %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr "Редактирование профиля %(username)s"
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -522,14 +645,68 @@ msgstr "Вы можете скачать современный браузер,\
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr "WebM-файл (640p; VP8/Vorbis)"
 
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+msgid "Add"
+msgstr "Добавить"
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
 msgstr "Добавление ваших файлов"
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-msgid "Add"
-msgstr "Добавить"
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr "Изменить"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr "Удалить"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr "Удалить %(title)s?"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr "Удалить безвозвратно"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
 #, python-format
@@ -559,14 +736,6 @@ msgstr "❖ Просмотр файлов пользователя <a href=\"%(u
 msgid "Image for %(media_title)s"
 msgstr "Изображение «%(media_title)s»"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr "Изменить"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr "Удалить"
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr "Добавить комментарий"
@@ -593,23 +762,27 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr "<h3>Добавлено</h3>\n      <p>%(date)s</p>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr "Сопутствующие файлы"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr "Добавить сопутствующий файл"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
-msgstr "Удалить %(title)s?"
+msgid "Add %(title)s to collection"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
-msgstr "Удалить безвозвратно"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
 msgid ""
@@ -698,10 +871,28 @@ msgid "Add media"
 msgstr "Добавить файлы"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr "Пока что тут файлов нет…"
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr "значок ленты"
@@ -753,35 +944,94 @@ msgstr "Метки"
 msgid "Could not read the image file."
 msgstr "Не удалось прочитать файл с изображением."
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr "Я уверен, что хочу удалить это"
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr "оставил комментарий к вашему файлу"
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr "Ой, ваш комментарий был пуст."
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr "Ваш комментарий размещён!"
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr "Некоторые файлы от этой записи не обнаружены.  Всё равно удаляем."
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr "Вы удалили файл."
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Файл не удалён, так как вы не подтвердили свою уверенность галочкой."
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Вы на пороге удаления файла другого пользователя. Будьте осторожны."
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo
index 60ab748c0766c5557004b2e70fcf8e0f40ac595b..17584d40f19fbbe984ff43f58c07ecc9909a13e7 100644 (file)
Binary files a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po
index 19d9a3e4d8f29df8194017b1d2c6d8178c25b3c7..3c0d6ac8fa6516edf2dcf398622532f44ceff380 100644 (file)
--- a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # Martin Zatroch <zatroch.martin@gmail.com>, 2012.
-#   <zatroch.martin@gmail.com>, 2011, 2012.
+#   <zatroch.martin@gmail.com>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-19 14:21-0500\n"
-"PO-Revision-Date: 2012-08-19 19:21+0000\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: sk\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -93,7 +93,9 @@ msgstr "Nebolo možné nájsť nikoho s týmto používateľským menom alebo e-
 msgid "You can now log in using your new password."
 msgstr "Teraz sa môžeš prihlásiť so svojim novým heslom."
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr "Nadpis"
 
@@ -102,7 +104,8 @@ msgid "Description of this work"
 msgstr "Charakteristika tohto diela"
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -117,11 +120,11 @@ msgstr "Značky"
 msgid "Separate tags by commas."
 msgstr "Oddeľ jednotlivé štítky čiarkami."
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr "Unikátna časť adresy"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr "Unikátna časť adresy nesmie byť prázdna"
 
@@ -162,43 +165,71 @@ msgstr "Nové heslo"
 
 #: mediagoblin/edit/forms.py:72
 msgid "Email me when others comment on my media"
+msgstr "Zaslať mi e-mail, keď ostatní pridajú komentár k médiu"
+
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
 msgstr ""
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr "Položku s rovnakou unikátnou časťou adresy už niekde máš."
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Upravuješ médiá niekoho iného. Dbaj na to."
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Upravuješ používateľský profil. Dbaj na to."
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr "Úpravy profilu uložené"
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr "Nastavenia účtu uložené"
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr "Nesprávne heslo"
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
-msgstr ""
+msgstr "Nemôžem priradiť tému.. žiadny set témy\n"
 
 #: mediagoblin/gmg_commands/theme.py:71
 msgid "No asset directory for this theme\n"
-msgstr ""
+msgstr "Žiadny priečinok položiek pre túto tému\n"
 
 #: mediagoblin/gmg_commands/theme.py:74
 msgid "However, old link directory symlink found; removed.\n"
-msgstr ""
+msgstr "Hoci, starý symbolický odkaz na priečinok nájdený; odstránený.\n"
 
 #: mediagoblin/media_types/__init__.py:60
 #: mediagoblin/media_types/__init__.py:120
@@ -207,6 +238,72 @@ msgstr "Prepáč, nepodporujem tento súborový typ =("
 
 #: mediagoblin/media_types/video/processing.py:35
 msgid "Video transcoding failed"
+msgstr "Konvertovanie videa zlyhalo"
+
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
 msgstr ""
 
 #: mediagoblin/processing/__init__.py:138
@@ -217,14 +314,24 @@ msgstr "Odovzdaný nesprávny súbor pre daný typ média."
 msgid "File"
 msgstr "Súbor"
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Musíš poskytnúť súbor."
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr "Juchú! Úspešne vložené!"
 
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr "Obrázok stresujúceho goblina pri chybovom kóde č. 404"
@@ -255,28 +362,32 @@ msgstr "Over si e-mailovú adresu!"
 msgid "+ Add media"
 msgstr "+ Pridať výtvor"
 
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "View your profile"
 msgstr "Zobraziť svoj profil"
 
-#: mediagoblin/templates/mediagoblin/base.html:69
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr "Odhlásiť sa"
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:75
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr "Prihlásenie"
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr "Poháňa nás <a href=\"http://mediagoblin.org\">MediaGoblin</a>, súčasť projektu <a href=\"http://gnu.org/\">GNU</a>."
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -302,7 +413,7 @@ msgstr "Táto stránka používa <a href=\"http://mediagoblin.org\">MediaGoblin<
 msgid ""
 "To add your own media, place comments, and more, you can log in with your "
 "MediaGoblin account."
-msgstr ""
+msgstr "Pre umiestnenie vlastných médií, pridanie komentárov a viac, sa môžeš prihlásiť so svojim MediaGoblin účtom."
 
 #: mediagoblin/templates/mediagoblin/root.html:31
 msgid "Don't have one yet? It's easy!"
@@ -330,7 +441,7 @@ msgstr "Sekcia spracovania výtvorov"
 #: mediagoblin/templates/mediagoblin/admin/panel.html:29
 msgid ""
 "Here you can track the state of media being processed on this instance."
-msgstr ""
+msgstr "Tu môžeš sledovať stav médií spracovávaných na tejto inštancii."
 
 #: mediagoblin/templates/mediagoblin/admin/panel.html:32
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
@@ -350,16 +461,16 @@ msgstr "Nasledovné nahratia neprešli spracovaním:"
 #: mediagoblin/templates/mediagoblin/admin/panel.html:90
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
 msgid "No failed entries!"
-msgstr ""
+msgstr "Žiadne zlé položky!"
 
 #: mediagoblin/templates/mediagoblin/admin/panel.html:92
 msgid "Last 10 successful uploads"
-msgstr ""
+msgstr "Posledných 10 úspešných nahratí"
 
 #: mediagoblin/templates/mediagoblin/admin/panel.html:112
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
 msgid "No processed entries, yet!"
-msgstr ""
+msgstr "Zatiaľ žiadne spracované položky!"
 
 #: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
 #: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
@@ -433,7 +544,7 @@ msgstr "Ahoj %(username)s,\n\npre aktiváciu tvojho GNU MediaGoblin účtu, otvo
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:35
 #, python-format
 msgid "Editing attachments for %(media_title)s"
-msgstr ""
+msgstr "Úprava príloh pre %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit.html:35
@@ -442,12 +553,17 @@ msgid "Editing %(media_title)s"
 msgstr "Úprava %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr "Zrušiť"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:43
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr "Uložiť zmeny"
@@ -458,12 +574,19 @@ msgstr "Uložiť zmeny"
 msgid "Changing %(username)s's account settings"
 msgstr "Mením nastavenia účtu používateľa %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr "Úprava profilu, ktorý vlastní %(username)s"
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -499,7 +622,7 @@ msgstr "Môžeš získať moderný prehliadač, ktorý\n\ttento zvuk hravo prehr
 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/video.html:56
 msgid "Original file"
-msgstr ""
+msgstr "Originálny súbor"
 
 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
 msgid "WebM file (Vorbis codec)"
@@ -521,23 +644,77 @@ msgstr "Môžeš získať moderný prehliadač, ktorý \n<span class=\"whitespac
 
 #: mediagoblin/templates/mediagoblin/media_displays/video.html:59
 msgid "WebM file (640p; VP8/Vorbis)"
+msgstr "WebM súbor (640p; VP8/Vorbis)"
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+msgid "Add"
+msgstr "Pridať"
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
 msgstr "Pridaj svoj výtvor"
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-msgid "Add"
-msgstr "Pridať"
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr "Upraviť"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr "Odstrániť"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr "Skutočne odstrániť %(title)s?"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr "Odstráň permanentne"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
 #, python-format
 msgid ""
 "Hi %(username)s,\n"
 "%(comment_author)s commented on your post (%(comment_url)s) at %(instance_name)s\n"
-msgstr ""
+msgstr "Ahoj %(username)s,\npoužívateľ %(comment_author)s skomentoval tvoj príspevok (%(comment_url)s) na %(instance_name)s\n"
 
 #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
 #, python-format
@@ -560,14 +737,6 @@ msgstr "❖ Prezeranie výtvorov podľa <a href=\"%(user_url)s\">%(username)s</a
 msgid "Image for %(media_title)s"
 msgstr "Obrázok pre %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr "Upraviť"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr "Odstrániť"
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr "Pridaj komentár"
@@ -594,23 +763,27 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr "<h3>Pridané</h3>\n      <p>%(date)s</p>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
-msgstr ""
+msgstr "Prílohy"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
-msgstr ""
+msgstr "Pridať prílohu"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
-msgstr "Skutočne odstrániť %(title)s?"
+msgid "Add %(title)s to collection"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
-msgstr "Odstráň permanentne"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
 msgid ""
@@ -619,7 +792,7 @@ msgstr "Tu môžeš sledovať priebeh spracovania výtvorov pre svoju galériu."
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
 msgid "Your last 10 successful uploads"
-msgstr ""
+msgstr "Tvojich 10 posledných úspešných nahratí"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:31
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:89
@@ -699,10 +872,28 @@ msgid "Add media"
 msgstr "Pridať výtvor"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr "Najskôr sa tu ešte nenachádzajú žiadne výtvory..."
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr "ikona čítačky"
@@ -754,35 +945,94 @@ msgstr "Označené ako"
 msgid "Could not read the image file."
 msgstr "Nebolo možné prečítať obrazový súbor."
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr "Jednoznačne to chcem odstrániť"
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
-msgstr ""
+msgstr "skomentoval tvoj príspevok"
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr "Ajaj, tvoj komentár bol prázdny."
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr "Tvoj komentár bol zaslaný!"
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
-msgstr ""
+msgstr "Niektoré súbory s danou položkou zrejme chýbajú..  Odstraňujem napriek tomu."
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr "Výtvor bol tebou odstránený."
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Výtvor nebol odstránený, nakoľko chýbalo tvoje potvrdenie."
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Chystáš sa odstrániť výtvory niekoho iného. Dbaj na to."
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo
index db167b599034c15a80b2aa70ee21c4a4eb9aa339..2e220bba2b3edcc0855076457d31f655b9dd665e 100644 (file)
Binary files a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po
index 806635bcfea8ee0086e5a78118832da9a413fb52..01830df6e35e4e131eba007efa63df829c51c90e 100644 (file)
--- a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-19 14:21-0500\n"
-"PO-Revision-Date: 2012-08-19 19:21+0000\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -92,7 +92,9 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr "Naslov"
 
@@ -101,7 +103,8 @@ msgid "Description of this work"
 msgstr ""
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -116,11 +119,11 @@ msgstr "Oznake"
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr "Oznaka"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr "Oznaka ne sme biti prazna"
 
@@ -163,30 +166,58 @@ msgstr ""
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr "Vnos s to oznako za tega uporabnika že obstaja."
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Urejate vsebino drugega uporabnika. Nadaljujte pazljivo."
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Urejate uporabniški profil. Nadaljujte pazljivo."
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr ""
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr ""
@@ -208,6 +239,72 @@ msgstr ""
 msgid "Video transcoding failed"
 msgstr ""
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr "Za vrsto vsebine je bila podana napačna datoteka."
@@ -216,14 +313,24 @@ msgstr "Za vrsto vsebine je bila podana napačna datoteka."
 msgid "File"
 msgstr "Datoteka"
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Podati morate datoteko."
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr "Juhej! Poslano."
 
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr "Slika napake 404 s paničnim škratom"
@@ -254,28 +361,32 @@ msgstr ""
 msgid "+ Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:68
-msgid "View your profile"
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/base.html:69
+msgid "View your profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:75
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr "Prijava"
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -441,12 +552,17 @@ msgid "Editing %(media_title)s"
 msgstr "Urejanje %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr "Prekliči"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:43
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr "Shrani spremembe"
@@ -457,12 +573,19 @@ msgstr "Shrani spremembe"
 msgid "Changing %(username)s's account settings"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr "Urejanje profila – %(username)s"
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -522,13 +645,67 @@ msgstr ""
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+msgid "Add"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-msgid "Add"
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
@@ -559,14 +736,6 @@ msgstr ""
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr ""
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr ""
@@ -593,22 +762,26 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
+msgid "Add %(title)s to collection"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
@@ -698,10 +871,28 @@ msgid "Add media"
 msgstr "Dodaj vsebino"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr "Videti je, da tu še ni nobene vsebine ..."
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr "Ikona vira"
@@ -753,35 +944,94 @@ msgstr ""
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr ""
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo
index 496f337a6e6b0c57ddcff2de1bfb8b1c3f335a99..ac0bcd2df350b98cc2d9f837316e90c15e7c3418 100644 (file)
Binary files a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po
index aa3c2cc100954fec8004940099114f36185c0850..e4e03496dca931a2d31b0408701d387dab859bf2 100644 (file)
--- a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-19 14:21-0500\n"
-"PO-Revision-Date: 2012-08-19 19:21+0000\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/mediagoblin/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: sq\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -92,7 +92,9 @@ msgstr "Nuk u gjet dot dikush me atë emër përdoruesi ose email."
 msgid "You can now log in using your new password."
 msgstr "Tani mun të hyni duke përdorur fjalëkalimin tuaj të ri."
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr "Titull"
 
@@ -101,7 +103,8 @@ msgid "Description of this work"
 msgstr "Përshkrim i kësaj pune"
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -116,11 +119,11 @@ msgstr "Etiketa"
 msgid "Separate tags by commas."
 msgstr "Ndajini etiketat me presje."
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr "Identifikues"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr "Identifikuesi s'mund të jetë i zbrazët"
 
@@ -163,30 +166,58 @@ msgstr "Fjalëkalimi i ri"
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr "Ka tashmë një zë me atë identifikues për këtë përdorues."
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Po përpunoni media të një tjetër përdoruesi. Bëni kujdes."
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Po përpunoni profilin e një përdoruesi. Bëni kujdes."
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr "Ndryshimet e profilit u ruajtën"
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr "Rregullimet e llogarisë u ruajtën"
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr "Fjalëkalim i gabuar"
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr ""
@@ -208,6 +239,72 @@ msgstr "Na ndjeni, nuk e mbullojmë këtë lloj kartele :("
 msgid "Video transcoding failed"
 msgstr ""
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr "Kartelë e gabuar e dhënë për llojin e medias."
@@ -216,14 +313,24 @@ msgstr "Kartelë e gabuar e dhënë për llojin e medias."
 msgid "File"
 msgstr "Kartelë"
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Duhet të jepni një kartelë."
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr "Yhaaaaaa! U parashtrua!"
 
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr "Figurë 404 e djallushit në siklet"
@@ -254,28 +361,32 @@ msgstr "Verifikoni email-in tuaj!"
 msgid "+ Add media"
 msgstr "+ Shtoni media"
 
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "View your profile"
 msgstr "Shihni profilin tuaj"
 
-#: mediagoblin/templates/mediagoblin/base.html:69
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr "Dilni"
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:75
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr "Hyni"
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr "Bazuar në <a href=\"http://mediagoblin.org\">MediaGoblin</a>, një projekt <a href=\"http://gnu.org/\">GNU</a>."
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -441,12 +552,17 @@ msgid "Editing %(media_title)s"
 msgstr "Po përpunohet %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr "Anuloje"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:43
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr "Ruaji ndryshimet"
@@ -457,12 +573,19 @@ msgstr "Ruaji ndryshimet"
 msgid "Changing %(username)s's account settings"
 msgstr "Po ndryshohen rregullimet e llogarisë %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr "Po përpunohet profili i %(username)s"
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -522,14 +645,68 @@ msgstr "Një shfletues web modern që \n\t    mund ta luajë këtë video mund t
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+msgid "Add"
+msgstr "Shtoni"
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
 msgstr "Shtoni media tuajën"
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-msgid "Add"
-msgstr "Shtoni"
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr "Përpunoni"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr "Fshije"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr "Të fshihet vërtet %(title)s?"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr "Fshije përgjithmonë"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
 #, python-format
@@ -559,14 +736,6 @@ msgstr "❖ Po shfletoni media nga <a href=\"%(user_url)s\">%(username)s</a>"
 msgid "Image for %(media_title)s"
 msgstr "Figurë për %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr "Përpunoni"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr "Fshije"
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr "Shtoni një koment"
@@ -593,23 +762,27 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr "<h3>Shtuar më</h3>\n      <p>%(date)s</p>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
-msgstr "Të fshihet vërtet %(title)s?"
+msgid "Add %(title)s to collection"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
-msgstr "Fshije përgjithmonë"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
 msgid ""
@@ -698,10 +871,28 @@ msgid "Add media"
 msgstr "Shtoni media"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr "Nuk duket ende të ketë ndonjë media këtu..."
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr "ikonë prurjesh"
@@ -753,35 +944,94 @@ msgstr "Etiketuar me"
 msgid "Could not read the image file."
 msgstr "Nuk lexoi dot kartelën e figurës."
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr "Jam i sigurt që dua të fshihet kjo"
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr "Hmmm, komenti juaj qe i zbrazët."
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr "Komenti juaj u postua!"
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr "E fshitë median."
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Media nuk u fshi ngaqë nuk i vutë shenjë pohimit se jeni i sigurt."
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Ju ndan një hap nga fshirja e medias të një tjetër përdoruesi. Bëni kujdes."
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo
index f8d731fc80d8319124f927350b176b13c875aab0..d0318a54849fa75b4823b437ed02f7c370830c2b 100644 (file)
Binary files a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po
index 77d12950767b53de7804434ebd5e537ad98242c2..7a68a8fdbcff9328bafded48b37d5f17453a5749 100644 (file)
--- a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-19 14:21-0500\n"
-"PO-Revision-Date: 2012-08-19 19:21+0000\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/mediagoblin/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: sr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -91,7 +91,9 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr ""
 
@@ -100,7 +102,8 @@ msgid "Description of this work"
 msgstr ""
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -115,11 +118,11 @@ msgstr ""
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr ""
 
@@ -162,30 +165,58 @@ msgstr ""
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr ""
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr ""
@@ -207,6 +238,72 @@ msgstr ""
 msgid "Video transcoding failed"
 msgstr ""
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr ""
@@ -215,14 +312,24 @@ msgstr ""
 msgid "File"
 msgstr ""
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr ""
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr ""
 
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr ""
@@ -253,28 +360,32 @@ msgstr ""
 msgid "+ Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:68
-msgid "View your profile"
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/base.html:69
+msgid "View your profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:75
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -440,12 +551,17 @@ msgid "Editing %(media_title)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:43
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr ""
@@ -456,12 +572,19 @@ msgstr ""
 msgid "Changing %(username)s's account settings"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -521,13 +644,67 @@ msgstr ""
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+msgid "Add"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-msgid "Add"
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
@@ -558,14 +735,6 @@ msgstr ""
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr ""
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr ""
@@ -592,22 +761,26 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
+msgid "Add %(title)s to collection"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
@@ -697,10 +870,28 @@ msgid "Add media"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr ""
@@ -752,35 +943,94 @@ msgstr ""
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr ""
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo
index 41a237eddd14ab54a6d3e3867100d13fd17370cf..fcbf7c8155552683b0f71f58c3eae72418353a52 100644 (file)
Binary files a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po
index 65d288b7bacaf5cfee2443ab154f1cb01d83d0f0..adcf2704694df8b903c1899b2b8384cd2e70bf5c 100644 (file)
--- a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-19 14:21-0500\n"
-"PO-Revision-Date: 2012-08-19 19:21+0000\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/mediagoblin/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -93,7 +93,9 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr "Titel"
 
@@ -102,7 +104,8 @@ msgid "Description of this work"
 msgstr "Beskrivning av verket"
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -117,11 +120,11 @@ msgstr "Taggar"
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr "Sökvägsnamn"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr "Sökvägsnamnet kan inte vara tomt"
 
@@ -164,30 +167,58 @@ msgstr ""
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr "Ett inlägg med det sökvägsnamnet existerar redan."
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Var försiktig, du redigerar någon annans inlägg."
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Var försiktig, du redigerar en annan användares profil."
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr "Fel lösenord"
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr ""
@@ -209,6 +240,72 @@ msgstr ""
 msgid "Video transcoding failed"
 msgstr ""
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr "Ogiltig fil för mediatypen."
@@ -217,14 +314,24 @@ msgstr "Ogiltig fil för mediatypen."
 msgid "File"
 msgstr "Fil"
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Du måste ange en fil"
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr "Tjohoo! Upladdat!"
 
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr "Bild av stressat 404-troll."
@@ -255,28 +362,32 @@ msgstr "Verifiera din e-postadress"
 msgid "+ Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:68
-msgid "View your profile"
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/base.html:69
+msgid "View your profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:75
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr "Logga in"
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -442,12 +553,17 @@ msgid "Editing %(media_title)s"
 msgstr "Redigerar %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr "Avbryt"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:43
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr "Spara ändringar"
@@ -458,12 +574,19 @@ msgstr "Spara ändringar"
 msgid "Changing %(username)s's account settings"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr "Redigerar %(username)ss profil"
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -523,13 +646,67 @@ msgstr ""
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+msgid "Add"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-msgid "Add"
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr "Vill du verkligen radera %(title)s?"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
@@ -560,14 +737,6 @@ msgstr ""
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr ""
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr ""
@@ -594,22 +763,26 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
-msgstr "Vill du verkligen radera %(title)s?"
+msgid "Add %(title)s to collection"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
@@ -699,10 +872,28 @@ msgid "Add media"
 msgstr "Lägg till media"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr "Det verkar inte finnas någon media här ännu."
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr "feed-ikon"
@@ -754,35 +945,94 @@ msgstr ""
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr "Jag är säker på att jag vill radera detta"
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Du tänker radera en annan användares media. Var försiktig."
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo
index 712ee9b7da79ce167157f0e245e116ca408e298f..c0a092830f4333143e6ff3d699db037b0ed81e0b 100644 (file)
Binary files a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po
index 540c8bdecde320268c53e7a21ef55672550f9cc4..30170a4c23d7e45f1aa291e2c61c55ee05f12f73 100644 (file)
--- a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-19 14:21-0500\n"
-"PO-Revision-Date: 2012-08-19 19:21+0000\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: te\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -92,7 +92,9 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr "శీర్షిక"
 
@@ -101,7 +103,8 @@ msgid "Description of this work"
 msgstr ""
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -116,11 +119,11 @@ msgstr ""
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr ""
 
@@ -163,30 +166,58 @@ msgstr ""
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr ""
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr ""
@@ -208,6 +239,72 @@ msgstr ""
 msgid "Video transcoding failed"
 msgstr ""
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr ""
@@ -216,14 +313,24 @@ msgstr ""
 msgid "File"
 msgstr ""
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr ""
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr ""
 
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr ""
@@ -254,28 +361,32 @@ msgstr ""
 msgid "+ Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:68
-msgid "View your profile"
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/base.html:69
+msgid "View your profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:75
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -441,12 +552,17 @@ msgid "Editing %(media_title)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr "రద్దుచేయి"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:43
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr "మార్పులను భద్రపరచు"
@@ -457,12 +573,19 @@ msgstr "మార్పులను భద్రపరచు"
 msgid "Changing %(username)s's account settings"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -522,13 +645,67 @@ msgstr ""
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+msgid "Add"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-msgid "Add"
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
@@ -559,14 +736,6 @@ msgstr ""
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr ""
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr ""
@@ -593,22 +762,26 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
+msgid "Add %(title)s to collection"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
@@ -698,10 +871,28 @@ msgid "Add media"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr ""
@@ -753,35 +944,94 @@ msgstr ""
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr ""
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo
index 5b34f79c1abca231a08b8ecc4ab31ee6e8f87fa7..1048e5104e4b44000258a0f1b1f3325a037ab1a8 100644 (file)
Binary files a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po
index 4d30d0b4375e6398ec91c02378d0d4e412aeb8b7..7537e834853d6542515bb3b2189249cdcd5bfdf8 100644 (file)
--- a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-19 14:21-0500\n"
-"PO-Revision-Date: 2012-08-19 19:21+0000\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Chinese (Taiwan) (Big5)  (http://www.transifex.com/projects/p/mediagoblin/language/zh_TW.Big5/)\n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: zh_TW.Big5\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -91,7 +91,9 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr ""
 
@@ -100,7 +102,8 @@ msgid "Description of this work"
 msgstr ""
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -115,11 +118,11 @@ msgstr ""
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr ""
 
@@ -162,30 +165,58 @@ msgstr ""
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr ""
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr ""
@@ -207,6 +238,72 @@ msgstr ""
 msgid "Video transcoding failed"
 msgstr ""
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr ""
@@ -215,14 +312,24 @@ msgstr ""
 msgid "File"
 msgstr ""
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr ""
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr ""
 
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr ""
@@ -253,28 +360,32 @@ msgstr ""
 msgid "+ Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:68
-msgid "View your profile"
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/base.html:69
+msgid "View your profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:75
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -440,12 +551,17 @@ msgid "Editing %(media_title)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:43
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr ""
@@ -456,12 +572,19 @@ msgstr ""
 msgid "Changing %(username)s's account settings"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -521,13 +644,67 @@ msgstr ""
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+msgid "Add"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-msgid "Add"
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
@@ -558,14 +735,6 @@ msgstr ""
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr ""
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr ""
@@ -592,22 +761,26 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
+msgid "Add %(title)s to collection"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
@@ -697,10 +870,28 @@ msgid "Add media"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr ""
@@ -752,35 +943,94 @@ msgstr ""
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr ""
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""

diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo
index 66edc72edf3c7d2652d431e8ae3922dab4b28788..44d89c036c18f6c3b0ad43c75c9499c54fb400fd 100644 (file)
Binary files a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo differ

diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po
index d72bb6c2987fb0669cac9c0ade379c4910bd06eb..50429ffc61965befb4640b1683bc7c4215f012cb 100644 (file)
--- a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-08-19 14:21-0500\n"
-"PO-Revision-Date: 2012-08-19 19:21+0000\n"
+"POT-Creation-Date: 2012-09-21 15:37-0500\n"
+"PO-Revision-Date: 2012-09-21 20:33+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 "Language: zh_TW\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
@@ -93,7 +93,9 @@ msgstr "找不到相關的使用者名稱或是電子郵件。"
 msgid "You can now log in using your new password."
 msgstr "你現在可以用新的密碼登入了！"
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/user_pages/forms.py:40
 msgid "Title"
 msgstr "標題"
 
@@ -102,7 +104,8 @@ msgid "Description of this work"
 msgstr "這個作品的描述"
 
 #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -117,11 +120,11 @@ msgstr "標籤"
 msgid "Separate tags by commas."
 msgstr "用逗號分隔標籤。"
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
 msgid "Slug"
 msgstr "自訂字串"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
 msgid "The slug can't be empty"
 msgstr "自訂字串不能空白"
 
@@ -164,30 +167,58 @@ msgstr "新密碼"
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/views.py:64
+#: mediagoblin/edit/forms.py:84
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:43
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/views.py:65
 msgid "An entry with that slug already exists for this user."
 msgstr "這個自訂字串已經被其他人用了"
 
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:86
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "你正在編輯他人的媒體檔案. 請謹慎處理."
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:182
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "你正在編輯一位用戶的檔案. 請謹慎處理."
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:198
 msgid "Profile changes saved"
 msgstr "修改的檔案已存檔"
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr "帳號設定已存檔"
 
-#: mediagoblin/edit/views.py:251
+#: mediagoblin/edit/views.py:252
 msgid "Wrong password"
 msgstr "密碼錯誤"
 
+#: mediagoblin/edit/views.py:287
+#, python-format
+msgid "You already have a collection called \"%s\"!title"
+msgstr ""
+
+#: mediagoblin/edit/views.py:290
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:307
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
 #: mediagoblin/gmg_commands/theme.py:58
 msgid "Cannot link theme... no theme set\n"
 msgstr ""
@@ -209,6 +240,72 @@ msgstr "抱歉，我不支援這樣的檔案格式 :("
 msgid "Video transcoding failed"
 msgstr ""
 
+#: mediagoblin/plugins/oauth/forms.py:26
+msgid "Client ID"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:28
+msgid "Next URL"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:31
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:37
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:39
+msgid ""
+"This will be visisble to users allowing your\n"
+"                appplication to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:41
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:46
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:53
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:55
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:67
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:59
+msgid "The client {0} has been registered!"
+msgstr ""
+
 #: mediagoblin/processing/__init__.py:138
 msgid "Invalid file given for media type."
 msgstr "指定錯誤的媒體類別！"
@@ -217,14 +314,24 @@ msgstr "指定錯誤的媒體類別！"
 msgid "File"
 msgstr "檔案"
 
-#: mediagoblin/submit/views.py:56
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "你必須提供一個檔案"
 
-#: mediagoblin/submit/views.py:163
+#: mediagoblin/submit/views.py:164
 msgid "Woohoo! Submitted!"
 msgstr "呼呼! 送出去嚕!"
 
+#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:215
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/404.html:24
 msgid "Image of 404 goblin stressing out"
 msgstr "Image of 404 goblin stressing out"
@@ -255,28 +362,32 @@ msgstr "確認你的電子郵件"
 msgid "+ Add media"
 msgstr "+ 加入媒體"
 
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:67
+msgid "+ Add collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "View your profile"
 msgstr "檢視你個人檔案"
 
-#: mediagoblin/templates/mediagoblin/base.html:69
+#: mediagoblin/templates/mediagoblin/base.html:70
 msgid "Log out"
 msgstr "登出"
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:75
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Log in"
 msgstr "登入"
 
-#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:89
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project."
 msgstr "由 <a href=\"http://mediagoblin.org\">MediaGoblin</a>製作, 它是一個 <a href=\"http://gnu.org/\">GNU</a> 專案"
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:92
 #, python-format
 msgid ""
 "Released under the <a "
@@ -442,12 +553,17 @@ msgid "Editing %(media_title)s"
 msgstr "編輯 %(media_title)s 中"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Cancel"
 msgstr "取消"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:43
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
 msgid "Save changes"
 msgstr "儲存變更"
@@ -458,12 +574,19 @@ msgstr "儲存變更"
 msgid "Changing %(username)s's account settings"
 msgstr "正在改變 %(username)s的帳號設定"
 
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr "編輯 %(username)s'的檔案中"
 
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
@@ -523,14 +646,68 @@ msgstr "你可以取得\n<span class=\"whitespace other\" title=\"Tab\">»</span
 msgid "WebM file (640p; VP8/Vorbis)"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+msgid "Add"
+msgstr "增加"
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
 msgstr "加入你的媒體"
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-msgid "Add"
-msgstr "增加"
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+msgid "Edit"
+msgstr "編輯"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+msgid "Delete"
+msgstr "刪除"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
+#, python-format
+msgid ""
+"<p>\n"
+"    %(collection_description)s\n"
+"  </p>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr "真的要刪除 %(title)s?"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+msgid "Delete permanently"
+msgstr "永遠刪除"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+msgid "Remove"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
 #, python-format
@@ -560,14 +737,6 @@ msgstr "❖ 由 <a href=\"%(user_url)s\">%(username)s</a>瀏覽媒體檔案"
 msgid "Image for %(media_title)s"
 msgstr " %(media_title)s的照片"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
-msgid "Edit"
-msgstr "編輯"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr "刪除"
-
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:102
 msgid "Add a comment"
 msgstr "新增評論"
@@ -594,23 +763,27 @@ msgid ""
 "      <p>%(date)s</p>"
 msgstr "<h3>加入日期</h3>\n      <p>%(date)s</p>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:167
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:183
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
 msgid "Attachments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:188
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
 msgid "Add attachment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
 #, python-format
-msgid "Really delete %(title)s?"
-msgstr "真的要刪除 %(title)s?"
+msgid "Add %(title)s to collection"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete permanently"
-msgstr "永遠刪除"
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+msgid "Add a new collection"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
 msgid ""
@@ -699,10 +872,28 @@ msgid "Add media"
 msgstr "新增媒體檔案"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr "似乎還沒有任何的媒體檔案..."
 
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
+#, python-format
+msgid ""
+"<br />\n"
+"              <a href=\"%(entry_url)s\">%(note)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
+#, python-format
+msgid "<br /><a href=\"%(remove_url)s\" class=\"remove\">(remove)</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:20
+#, python-format
+msgid "In collections (%(collected)s)"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr "feed圖示"
@@ -754,35 +945,94 @@ msgstr "標籤為"
 msgid "Could not read the image file."
 msgstr "無法讀取影像檔案。"
 
-#: mediagoblin/user_pages/forms.py:30
+#: mediagoblin/user_pages/forms.py:28
 msgid "I am sure I want to delete this"
 msgstr "我確定我想要刪除"
 
+#: mediagoblin/user_pages/forms.py:32
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:37
+msgid "Include a note"
+msgstr ""
+
 #: mediagoblin/user_pages/lib.py:56
 msgid "commented on your post"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:160
+#: mediagoblin/user_pages/views.py:161
 msgid "Oops, your comment was empty."
 msgstr "啊，你的留言是空的。"
 
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:167
 msgid "Your comment has been posted!"
 msgstr "你的留言已經刊登！"
 
-#: mediagoblin/user_pages/views.py:200
+#: mediagoblin/user_pages/views.py:235
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:243
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:258
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:266
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:297
 msgid ""
 "Some of the files with this entry seem to be missing.  Deleting anyway."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr "你已刪除此媒體檔案。"
 
-#: mediagoblin/user_pages/views.py:212
+#: mediagoblin/user_pages/views.py:309
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "此媒體檔案尚未被刪除因為你還沒有確認你真的要刪除。"
 
-#: mediagoblin/user_pages/views.py:220
+#: mediagoblin/user_pages/views.py:317
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "你在刪除其他人的媒體檔案。請小心處理喔。"
+
+#: mediagoblin/user_pages/views.py:379
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:383
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:393
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:426
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:433
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:443
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""