From: Christopher Allan Webber
Date: Mon, 3 Dec 2012 19:23:55 +0000 (-0600)
Subject: Committing extracted and compiled translations
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=304934b31ddd8259a13c36be2cc66d050e019020;p=mediagoblin.git
Committing extracted and compiled translations
---
diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo
index eaec0daa..fe10204f 100644
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 cf090994..b319ea52 100644
--- 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-09-24 14:01-0500\n"
-"PO-Revision-Date: 2012-09-24 18:57+0000\n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -94,7 +94,7 @@ msgstr ""
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -105,7 +105,7 @@ msgid "Description of this work"
msgstr "Ùص٠Ùذا اÙعÙ
Ù."
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
@@ -121,11 +121,11 @@ msgstr "اÙÙسÙÙ
"
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "اÙÙ
سار"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "Ùا ÙÙ
Ù٠تر٠اÙÙ
سار ÙارغÙا"
@@ -164,20 +164,20 @@ msgstr ""
msgid "New password"
msgstr ""
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr ""
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
@@ -191,33 +191,38 @@ msgstr "ÙÙجد Ù
Ù٠آخر بÙذا اÙÙ
سار Ùد٠Ùذ٠اÙÙ
ستخ
msgid "You are editing another user's media. Proceed with caution."
msgstr "Ø£Ùت تØرÙر Ùسائط Ù
ستخدÙ
آخر. ÙÙ ØذرÙا أثÙاء اÙعÙ
ÙÙØ©."
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Ø£Ùت تØرÙر Ù
ÙÙ Ù
ستخدÙ
آخر. ÙÙ ØذرÙا أثÙاء اÙعÙ
ÙÙØ©."
-#: mediagoblin/edit/views.py:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
msgstr ""
-#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
#: mediagoblin/user_pages/views.py:215
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:292
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:309
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
@@ -329,46 +334,27 @@ msgstr "Ùا سÙاÙ
! ÙÙشرÙت!"
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/404.html:24
-msgid "Image of 404 goblin stressing out"
-msgstr "صÙرة ÙزÙ
Ù
رتبÙ"
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr "ÙÙØÙ!"
-
-#: mediagoblin/templates/mediagoblin/404.html:26
-msgid "There doesn't seem to be a page at this address. Sorry!"
-msgstr "Ùبد٠أÙÙ Ùا تÙجد صÙØØ© Ù٠اÙعÙÙاÙ. عذرÙا!"
-
-#: 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."
-msgstr "Ø¥Ù ÙÙت Ù
تأÙدÙا Ù
٠صØØ© اÙعÙÙا٠ÙربÙ
ا تÙÙ٠اÙصÙØØ© اÙت٠ترÙدÙا ÙÙÙÙت Ø£Ù ØÙØ°Ùت."
-
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr "شعار Ù
ÙدÙاغÙبÙÙ"
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
-msgstr ""
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
+msgstr "أض٠Ùسائط"
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
+msgid "Verify your email!"
msgstr ""
#: mediagoblin/templates/mediagoblin/base.html:75
@@ -392,31 +378,56 @@ msgid ""
"href=\"%(source_link)s\">Source code available."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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 "ÙÙØØ© Ù
عاÙجة اÙÙسائط"
+
+#: mediagoblin/templates/mediagoblin/root.html:51
msgid "Explore"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
@@ -424,17 +435,10 @@ msgid ""
" Set up MediaGoblin on your own server"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
msgstr "Ø£Øدث اÙÙسائط"
-#: 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 "ÙÙØØ© Ù
عاÙجة اÙÙسائط"
-
#: mediagoblin/templates/mediagoblin/admin/panel.html:29
msgid ""
"Here you can track the state of media being processed on this instance."
@@ -543,30 +547,43 @@ msgstr "Ø£ÙÙÙا Ùا %(username)sØ\n\nاÙØªØ Ø§Ùرابط اÙتاÙÙ\nÙ
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"
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr "Ø£ÙغÙ"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
msgid "Save changes"
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"
+
#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
msgstr ""
@@ -592,13 +609,11 @@ msgstr ""
#: 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 ""
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr ""
@@ -649,7 +664,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
msgstr ""
@@ -693,7 +708,7 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr ""
@@ -702,7 +717,7 @@ msgstr ""
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
msgstr ""
@@ -760,13 +775,8 @@ msgid ""
" %(date)s
"
msgstr ""
-#: 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:192
-msgid "Add attachment"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
@@ -774,11 +784,11 @@ msgstr ""
msgid "Add %(title)s to collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
msgstr ""
@@ -849,41 +859,25 @@ msgstr "ØرÙÙر اÙÙ
Ù٠اÙشخصÙ"
msgid "This user hasn't filled in their profile (yet)."
msgstr "ÙÙ
Ùعبئ Ùذا اÙعض٠بÙاÙات Ù
ÙÙ٠بعد."
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr "أظÙÙر ÙÙ Ùسائط %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
msgstr "ÙÙا ستظÙر ÙسائطÙØ ÙÙÙÙ Ùبد٠أÙÙ ÙÙ
تض٠شÙئÙا بعد."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
msgid "There doesn't seem to be any media here yet..."
msgstr "Ùا Ùبد٠أÙ٠تÙجد Ø£Ù Ùسائط ÙÙا Øت٠اÙØ¢Ù..."
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
-#, python-format
-msgid ""
-"
\n"
-" %(note)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
@@ -903,7 +897,7 @@ msgstr ""
msgid "Location"
msgstr ""
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
msgstr ""
@@ -942,6 +936,32 @@ msgstr ""
msgid "Could not read the image file."
msgstr ""
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr "ÙÙØÙ!"
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:28
msgid "I am sure I want to delete this"
msgstr "Ø£Ùا Ù
تأÙد Ù
٠رغبت٠بØØ°Ù Ùذا اÙعÙ
Ù"
diff --git a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo
index 89fde97f..31700e95 100644
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 ee4a0aca..f01bd3a8 100644
--- a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po
@@ -5,12 +5,13 @@
# Translators:
# Al fred , 2011.
# , 2011.
+# , 2012.
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-09-24 14:01-0500\n"
-"PO-Revision-Date: 2012-09-24 18:57+0000\n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -34,11 +35,11 @@ msgstr "Adreça electrònica"
#: mediagoblin/auth/forms.py:51
msgid "Username or email"
-msgstr ""
+msgstr "Nom d'usuari o correu"
#: mediagoblin/auth/forms.py:58
msgid "Incorrect input"
-msgstr ""
+msgstr "Entrada incorrecte"
#: mediagoblin/auth/views.py:55
msgid "Sorry, registration is disabled on this instance."
@@ -50,7 +51,7 @@ msgstr "Lamentablement aquest usuari ja existeix."
#: mediagoblin/auth/views.py:79
msgid "Sorry, a user with that email address already exists."
-msgstr ""
+msgstr "Perdó, ja existeix un usuari amb aquesta adreça de correu."
#: mediagoblin/auth/views.py:182
msgid ""
@@ -64,11 +65,11 @@ msgstr "La clau de verificació o la identificació de l'usuari no són correcte
#: mediagoblin/auth/views.py:206
msgid "You must be logged in so we know who to send the email to!"
-msgstr ""
+msgstr "Has d'estar conectat per saber a qui hem d'enviar el correu!"
#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
-msgstr ""
+msgstr "Ja has verificat la teva adreça de correu!"
#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
@@ -77,23 +78,23 @@ msgstr "Torna'm a enviar el correu de verificació"
#: mediagoblin/auth/views.py:263
msgid ""
"An email has been sent with instructions on how to change your password."
-msgstr ""
+msgstr "S'ha enviat un correu amb instruccions de com cambiar la teva contrasenya"
#: mediagoblin/auth/views.py:273
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
-msgstr ""
+msgstr "No hem pogut enviar el correu de recuperació de contrasenya perquè el teu nom d'usuari és inactiu o bé l'adreça electrònica del teu compte no ha sigut verificada."
#: mediagoblin/auth/views.py:285
msgid "Couldn't find someone with that username or email."
-msgstr ""
+msgstr "No es troba ningu amb aquest nom d'usuari o correu electrònic."
#: mediagoblin/auth/views.py:333
msgid "You can now log in using your new password."
-msgstr ""
+msgstr "Ara et pots conectar amb la teva nova contrasenya."
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -101,16 +102,16 @@ msgstr "TÃtol"
#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
msgid "Description of this work"
-msgstr ""
+msgstr "Descripció d'aquest treball."
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
-msgstr ""
+msgstr "Pots utilitzarâ â Markdown per donar-li format"
#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
msgid "Tags"
@@ -118,26 +119,26 @@ msgstr "Etiquetes"
#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
-msgstr ""
+msgstr "Separa els tags amb comes."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
-msgstr ""
+msgstr "Llimac"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
-msgstr ""
+msgstr "El llimac no pot ésser buit"
#: mediagoblin/edit/forms.py:40
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
-msgstr ""
+msgstr "El tÃtol de l'adreça d'aquest mitjà . Normalment no necessites modificar això."
#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
-msgstr ""
+msgstr "Llicència"
#: mediagoblin/edit/forms.py:50
msgid "Bio"
@@ -149,80 +150,85 @@ msgstr "Lloc web"
#: mediagoblin/edit/forms.py:58
msgid "This address contains errors"
-msgstr ""
+msgstr "Aquesta adreça conté errors"
#: mediagoblin/edit/forms.py:63
msgid "Old password"
-msgstr ""
+msgstr "Contrasenya antiga"
#: mediagoblin/edit/forms.py:64
msgid "Enter your old password to prove you own this account."
-msgstr ""
+msgstr "Introdueix la teva contrasenya antiga per comprovar que aquest compte és teu."
#: mediagoblin/edit/forms.py:67
msgid "New password"
-msgstr ""
+msgstr "Nova contrasenya"
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
-msgstr ""
+msgstr "Envia'm correu quan d'altres comentin al meu mitjà "
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
-msgstr ""
+msgstr "El tÃtol no pot ser buit"
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
-msgstr ""
+msgstr "Descripció d'aquesta col.lecció"
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
-msgstr ""
+msgstr "La part del tÃtol de l'adreça d'aquesta col.lecció. Normalment no cal que canviis això."
#: mediagoblin/edit/views.py:65
msgid "An entry with that slug already exists for this user."
-msgstr ""
+msgstr "Ja existeix una entrada amb aquest llimac per aquest usuari"
#: 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:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
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:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
-msgstr ""
+msgstr "Els canvis al perfil s'han guardat"
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
-msgstr ""
+msgstr "Els detalls del compte s'han guardat"
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
-msgstr ""
+msgstr "Contrasenya errònia"
-#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
#: mediagoblin/user_pages/views.py:215
#, python-format
msgid "You already have a collection called \"%s\"!"
-msgstr ""
+msgstr "Ja tens una col.lecció anomenada \"%s\"!"
-#: mediagoblin/edit/views.py:292
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:309
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
-msgstr ""
+msgstr "Estas editant la col.lecció d'un altre usuari. Prossegueix amb cautela."
#: mediagoblin/gmg_commands/theme.py:58
msgid "Cannot link theme... no theme set\n"
-msgstr ""
+msgstr "No es pot enllaçar el tema... no hi ha tema establert\n"
#: mediagoblin/gmg_commands/theme.py:71
msgid "No asset directory for this theme\n"
@@ -230,54 +236,54 @@ msgstr ""
#: mediagoblin/gmg_commands/theme.py:74
msgid "However, old link directory symlink found; removed.\n"
-msgstr ""
+msgstr "Tot i aixÃ, l'enllaç antic al directori s'ha trobat; eliminat.\n"
#: mediagoblin/media_types/__init__.py:60
#: mediagoblin/media_types/__init__.py:120
msgid "Sorry, I don't support that file type :("
-msgstr ""
+msgstr "Ho sento, no puc manegar aquest tipus d'arxiu :("
#: mediagoblin/media_types/video/processing.py:35
msgid "Video transcoding failed"
-msgstr ""
+msgstr "La transformació del vÃdeo ha fallat"
#: mediagoblin/plugins/oauth/forms.py:26
msgid "Client ID"
-msgstr ""
+msgstr "ID del client"
#: mediagoblin/plugins/oauth/forms.py:28
msgid "Next URL"
-msgstr ""
+msgstr "Següent URL"
#: mediagoblin/plugins/oauth/forms.py:30
msgid "Allow"
-msgstr ""
+msgstr "Permetre"
#: mediagoblin/plugins/oauth/forms.py:31
msgid "Deny"
-msgstr ""
+msgstr "Denegar"
#: mediagoblin/plugins/oauth/forms.py:35
msgid "Name"
-msgstr ""
+msgstr "Nom"
#: mediagoblin/plugins/oauth/forms.py:36
msgid "The name of the OAuth client"
-msgstr ""
+msgstr "El nom del client OAuth"
#: mediagoblin/plugins/oauth/forms.py:37
msgid "Description"
-msgstr ""
+msgstr "Descripció"
#: mediagoblin/plugins/oauth/forms.py:39
msgid ""
"This will be visible to users allowing your\n"
" application to authenticate as them."
-msgstr ""
+msgstr "Això serà visiable a usuaris que permetin que la teva aplicació\n s'autentifiqui com a ells."
#: mediagoblin/plugins/oauth/forms.py:41
msgid "Type"
-msgstr ""
+msgstr "Tipus"
#: mediagoblin/plugins/oauth/forms.py:46
msgid ""
@@ -287,25 +293,25 @@ msgid ""
" Public - The client can't make confidential\n"
" requests to the GNU MediaGoblin instance (e.g. client-side\n"
" JavaScript client)."
-msgstr ""
+msgstr "Confidencial - El client pot\n fer peticions a la instà ncia GNU MediaGoblin que no pot ésser\n interceptada per l'agent d'usuari (el client a la part servidor).
\n Public - El client no pot fer peticions \n confidencials a la instà ncia GNU MediaGoblin (la part \n client JavaScript)."
#: mediagoblin/plugins/oauth/forms.py:53
msgid "Redirect URI"
-msgstr ""
+msgstr "Redireccionar URI "
#: mediagoblin/plugins/oauth/forms.py:55
msgid ""
"The redirect URI for the applications, this field\n"
" is required for public clients."
-msgstr ""
+msgstr "La URI de redirecció per les aplicacions, aquest camp\n és requeriment per els clients públics."
#: mediagoblin/plugins/oauth/forms.py:67
msgid "This field is required for public clients"
-msgstr ""
+msgstr "Aquest camp és requeriment per a clients públics"
#: mediagoblin/plugins/oauth/views.py:59
msgid "The client {0} has been registered!"
-msgstr ""
+msgstr "El client {0} ha sigut enregistrat!"
#: mediagoblin/processing/__init__.py:138
msgid "Invalid file given for media type."
@@ -326,49 +332,30 @@ msgstr "Visca! S'ha enviat!"
#: 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..."
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr "Ups!"
-
-#: mediagoblin/templates/mediagoblin/404.html:26
-msgid "There doesn't seem to be a page at this address. Sorry!"
-msgstr "Sembla que no hi ha cap pà gina en aquesta adreça. Ho sentim."
-
-#: 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."
-msgstr "Si esteu convençut que l'adreça és correcta, pot ser que la pà gina que cerqueu s'hagi canviat d'ubicació o s'hagi eliminat."
+msgstr "S'ha afegit la col.leccio \"%s\"!"
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr "Logo de mediagoblin"
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
-msgstr ""
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
+msgstr "Tots els fitxers"
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
-msgstr ""
+msgid "Verify your email!"
+msgstr "Verifica el teu correu electrònic"
#: mediagoblin/templates/mediagoblin/base.html:75
#: mediagoblin/templates/mediagoblin/auth/login.html:28
@@ -381,7 +368,7 @@ msgstr "Entra"
msgid ""
"Powered by MediaGoblin, a GNU project."
-msgstr ""
+msgstr "Alimentat per MediaGoblin, un projecte GNU."
#: mediagoblin/templates/mediagoblin/base.html:92
#, python-format
@@ -389,55 +376,73 @@ msgid ""
"Released under the AGPL. Source code available."
+msgstr "Alliberat segons la AGPL. Codi font disponible."
+
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:24
-msgid "Explore"
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:26
-msgid "Hi there, welcome to this MediaGoblin site!"
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr "Modificar els ajustaments del compte"
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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 "Quadre de processament de fitxers"
+
+#: mediagoblin/templates/mediagoblin/root.html:51
+msgid "Explore"
+msgstr "Explorar"
+
+#: mediagoblin/templates/mediagoblin/root.html:53
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "Hola, una benvinguda al MediaGoblin!"
+
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
-msgstr ""
+msgstr "El lloc esta usant MediaGoblin, una gran i extraordinà ria peça de software per allotjar mitjans."
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
-msgstr ""
+msgstr "Per afegir el teu propi mitjà , col.locar comentaris, i més, pots conectar-te amb el teu compte MediaGoblin."
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
-msgstr ""
+msgstr "No en tens una encara? Es fà cil!"
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
" or\n"
" Set up MediaGoblin on your own server"
-msgstr ""
+msgstr "Crear un compte a aquest lloc \no\n Preparar MediaGoblin al teu propi servidor"
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
-msgstr ""
-
-#: 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 "Quadre de processament de fitxers"
+msgstr "Mitjans més recents"
#: mediagoblin/templates/mediagoblin/admin/panel.html:29
msgid ""
"Here you can track the state of media being processed on this instance."
-msgstr ""
+msgstr "Aqui pots seguir l'estat del mitjà que s'està processant a aquesta instà ncia."
#: mediagoblin/templates/mediagoblin/admin/panel.html:32
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
@@ -447,7 +452,7 @@ msgstr "S'està processant el fitxer"
#: mediagoblin/templates/mediagoblin/admin/panel.html:58
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
msgid "No media in-processing"
-msgstr ""
+msgstr "No s'està processant cap mitjà "
#: mediagoblin/templates/mediagoblin/admin/panel.html:61
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59
@@ -457,34 +462,34 @@ msgstr "No s'han pogut penjar els següents fitxers:"
#: mediagoblin/templates/mediagoblin/admin/panel.html:90
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
msgid "No failed entries!"
-msgstr ""
+msgstr "Sense entrades fallades!"
#: mediagoblin/templates/mediagoblin/admin/panel.html:92
msgid "Last 10 successful uploads"
-msgstr ""
+msgstr "Les últimes 10 pujades correctes"
#: mediagoblin/templates/mediagoblin/admin/panel.html:112
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
msgid "No processed entries, yet!"
-msgstr ""
+msgstr "Encara no hi ha entrades processades!"
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
-msgstr ""
+msgstr "Estableix la teva nova contrasenya"
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39
msgid "Set password"
-msgstr ""
+msgstr "Establir contrasenya"
#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23
#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31
msgid "Recover password"
-msgstr ""
+msgstr "Recuperar contrasenya"
#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34
msgid "Send instructions"
-msgstr ""
+msgstr "Enviar instruccions"
#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19
#, python-format
@@ -498,7 +503,7 @@ msgid ""
"\n"
"If you think this is an error, just ignore this email and continue being\n"
"a happy goblin!"
-msgstr ""
+msgstr "Hola %(username)s,â â per cambiar la teva contrasenya de GNU MediaGoblin, obre la següent URL al â teu navegador:â â %(verification_url)sâ â Si creus que hi ha un error, ignora el correu i continua essentâ un goblin feliç!"
#: mediagoblin/templates/mediagoblin/auth/login.html:39
msgid "Logging in failed!"
@@ -514,7 +519,7 @@ msgstr "Creeu-ne un aquÃ!"
#: mediagoblin/templates/mediagoblin/auth/login.html:51
msgid "Forgot your password?"
-msgstr ""
+msgstr "Has oblidat la teva contrasenya?"
#: mediagoblin/templates/mediagoblin/auth/register.html:28
#: mediagoblin/templates/mediagoblin/auth/register.html:36
@@ -540,46 +545,59 @@ msgstr "Hi %(username)s,\n\nto activate your GNU MediaGoblin account, open the f
#: mediagoblin/templates/mediagoblin/edit/attachments.html:35
#, python-format
msgid "Editing attachments for %(media_title)s"
+msgstr "Editant afegits per a %(media_title)s"
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit.html:23
-#: mediagoblin/templates/mediagoblin/edit/edit.html:35
-#, python-format
-msgid "Editing %(media_title)s"
-msgstr "Edició %(media_title)s "
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr "Cancel·la"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
msgid "Save changes"
msgstr "Desa els canvis"
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr "Edició %(media_title)s "
+
#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
-msgstr ""
+msgstr "Modificant els detalls del compte de %(username)s"
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
-msgstr ""
+msgstr "Editant %(collection_title)s"
#: 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 ""
+msgstr "Editant perfil de %(username)s"
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
@@ -587,95 +605,93 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/listings/tag.html:35
#, python-format
msgid "Media tagged with: %(tag_name)s"
-msgstr ""
+msgstr "Mitjà marcat amb: %(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 "Descarregar"
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
-msgstr ""
+msgstr "Original"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
msgid ""
"Sorry, this audio will not work because \n"
"\tyour web browser does not support HTML5 \n"
"\taudio."
-msgstr ""
+msgstr "Ho sento, aquest audiothis à udio no funcionarà perque \n »el teu navegador web no contempla suport d'à udio \n »HTML5."
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
msgid ""
"You can get a modern web browser that \n"
"\tcan play the audio at \n"
"\t http://getfirefox.com!"
-msgstr ""
+msgstr "Pots obtenir un navegador web modern que \n »podrà reproduir l'à udio, a \n » http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
#: mediagoblin/templates/mediagoblin/media_displays/video.html:56
msgid "Original file"
-msgstr ""
+msgstr "Arxiu original"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
msgid "WebM file (Vorbis codec)"
-msgstr ""
+msgstr "Arxiu WebM (Vorbis codec)"
#: 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 "Ho sento, aquest video no funcionarà perquè \n » el teu navegador web no té suport per videos \n » HTML5."
#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
msgid ""
"You can get a modern web browser that \n"
"\t can play this video at \n"
"\t http://getfirefox.com!"
-msgstr ""
+msgstr "Pots obtenir un navegador web modern que \n » podrà reproduir aquest vÃdeo, a \n » http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/video.html:59
msgid "WebM file (640p; VP8/Vorbis)"
-msgstr ""
+msgstr "Arxiu WebM (640p; VP8/Vorbis)"
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
-msgstr ""
+msgstr "Afegir a la col.lecció"
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
-msgstr ""
+msgstr "Afegir"
#: mediagoblin/templates/mediagoblin/submit/start.html:23
#: mediagoblin/templates/mediagoblin/submit/start.html:30
msgid "Add your media"
-msgstr ""
+msgstr "Afegeix el teu mitjà "
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
#, python-format
msgid "%(collection_title)s (%(username)s's collection)"
-msgstr ""
+msgstr "%(collection_title)s (la col.lecció de %(username)s)"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
#, python-format
msgid "%(collection_title)s by %(username)s"
-msgstr ""
+msgstr "%(collection_title)s per a %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
msgid "Edit"
-msgstr ""
+msgstr "Editar"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
msgid "Delete"
-msgstr ""
+msgstr "Esborrar"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59
#, python-format
@@ -683,39 +699,39 @@ msgid ""
"\n"
" %(collection_description)s\n"
"
"
-msgstr ""
+msgstr "\n %(collection_description)s\n
"
#: 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 ""
+msgstr "Realment vols esborrar %(title)s?"
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
-msgstr ""
+msgstr "Esborrar permanentment"
#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
#, python-format
msgid "Really remove %(media_title)s from %(collection_title)s?"
-msgstr ""
+msgstr "Relment eliminar %(media_title)s de %(collection_title)s?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
-msgstr ""
+msgstr "Eliminar"
#: 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 "Hola %(username)s,\n%(comment_author)s ha comentat el teu post (%(comment_url)s) a %(instance_name)s\n"
#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
#, python-format
msgid "%(username)s's media"
-msgstr ""
+msgstr "Mitjà de %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37
#, python-format
@@ -725,76 +741,71 @@ msgstr "%(username)s's media"
#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
#, python-format
msgid "â Browsing media by %(username)s"
-msgstr ""
+msgstr "â Navegant mitjà per a %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/media.html:67
#: mediagoblin/templates/mediagoblin/user_pages/media.html:73
#, python-format
msgid "Image for %(media_title)s"
-msgstr ""
+msgstr "Imatge per %(media_title)s"
#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
msgid "Add a comment"
-msgstr ""
+msgstr "Afegeix un comentari"
#: mediagoblin/templates/mediagoblin/user_pages/media.html:109
msgid ""
"You can use Markdown for"
" formatting."
-msgstr ""
+msgstr "Pots usar Markdown per donar format."
#: mediagoblin/templates/mediagoblin/user_pages/media.html:113
msgid "Add this comment"
-msgstr ""
+msgstr "Afegir aquest comentari"
#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
msgid "at"
-msgstr ""
+msgstr "a"
#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
#, python-format
msgid ""
"Added on
\n"
" %(date)s
"
-msgstr ""
+msgstr "Afegit el
\n %(date)s
"
-#: 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:192
-msgid "Add attachment"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
#, python-format
msgid "Add %(title)s to collection"
-msgstr ""
+msgstr "Afegir %(title)s a la col.lecció"
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
-msgstr ""
+msgstr "+"
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
-msgstr ""
+msgstr "Afegir una nova col.lecció"
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
msgid ""
"You can track the state of media being processed for your gallery here."
-msgstr ""
+msgstr "Aqui pots seguir l'estat del mitjà que s'està processant per la teva galeria"
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
msgid "Your last 10 successful uploads"
-msgstr ""
+msgstr "Les teves 10 últimes pujades correctes"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:31
#: mediagoblin/templates/mediagoblin/user_pages/user.html:89
#, python-format
msgid "%(username)s's profile"
-msgstr ""
+msgstr "Perfil de %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:43
msgid "Sorry, no such user found."
@@ -837,7 +848,7 @@ msgstr "Si siu aqeust usuari però heu perdut el correu de verificació, podeu <
#: mediagoblin/templates/mediagoblin/user_pages/user.html:96
msgid "Here's a spot to tell others about yourself."
-msgstr ""
+msgstr "Aqui hi ha un espai per explicar de tu als demés"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:101
#: mediagoblin/templates/mediagoblin/user_pages/user.html:118
@@ -848,47 +859,31 @@ msgstr "Edita el perfil"
msgid "This user hasn't filled in their profile (yet)."
msgstr "Aquest usuari encara no ha escrit res al seu perfil."
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr "View all of %(username)s's media"
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
-msgstr ""
+msgstr "Aqui és on apareixerà el teu mitjà , però sembla que encara no hi has afegit res."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
msgid "There doesn't seem to be any media here yet..."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
-#, python-format
-msgid ""
-"
\n"
-" %(note)s"
-msgstr ""
+msgstr "Sembla que no hi ha cap mitjà aqui encara..."
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
#, python-format
msgid "In collections (%(collected)s)"
-msgstr ""
+msgstr "A les col.leccions (%(collected)s)"
#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
msgid "feed icon"
@@ -900,38 +895,38 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
msgid "Location"
-msgstr ""
+msgstr "Ubicació"
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
-msgstr ""
+msgstr "Veure a OpenStreetMap"
#: mediagoblin/templates/mediagoblin/utils/license.html:25
msgid "All rights reserved"
-msgstr ""
+msgstr "Tots els drets reservats"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:39
msgid "â Newer"
-msgstr ""
+msgstr "â Més nou"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:45
msgid "Older â"
-msgstr ""
+msgstr "Més antic â"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:48
msgid "Go to page:"
-msgstr ""
+msgstr "Anar a la pà gina:"
#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
msgid "newer"
-msgstr ""
+msgstr "més nou"
#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
msgid "older"
-msgstr ""
+msgstr "més antic"
#: mediagoblin/templates/mediagoblin/utils/tags.html:20
msgid "Tagged with"
@@ -939,96 +934,122 @@ msgstr ""
#: mediagoblin/tools/exif.py:78
msgid "Could not read the image file."
+msgstr "No s'ha pogut llegir l'arxiu d'imatge"
+
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr "Ups!"
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
msgstr ""
#: mediagoblin/user_pages/forms.py:28
msgid "I am sure I want to delete this"
-msgstr ""
+msgstr "Estic segur que vull esborrar això"
#: mediagoblin/user_pages/forms.py:32
msgid "I am sure I want to remove this item from the collection"
-msgstr ""
+msgstr "Estic segur que vull esborrar aquest element de la col.lecció"
#: mediagoblin/user_pages/forms.py:35
msgid "-- Select --"
-msgstr ""
+msgstr "-- Sel.leccionar --"
#: mediagoblin/user_pages/forms.py:37
msgid "Include a note"
-msgstr ""
+msgstr "Incluir una nota"
#: mediagoblin/user_pages/lib.py:56
msgid "commented on your post"
-msgstr ""
+msgstr "comentat al teu post"
#: mediagoblin/user_pages/views.py:161
msgid "Oops, your comment was empty."
-msgstr ""
+msgstr "Uups, el teu comentari era buit."
#: mediagoblin/user_pages/views.py:167
msgid "Your comment has been posted!"
-msgstr ""
+msgstr "El teu comentari s'ha publicat!"
#: mediagoblin/user_pages/views.py:235
msgid "You have to select or add a collection"
-msgstr ""
+msgstr "Has de sel.leccionar o afegir una col.lecció"
#: mediagoblin/user_pages/views.py:243
#, python-format
msgid "\"%s\" already in collection \"%s\""
-msgstr ""
+msgstr "\"%s\" ja és a la col.lecció \"%s\""
#: mediagoblin/user_pages/views.py:258
#, python-format
msgid "\"%s\" added to collection \"%s\""
-msgstr ""
+msgstr "\"%s\" afegir a la col.lecció \"%s\""
#: mediagoblin/user_pages/views.py:266
msgid "Please check your entries and try again."
-msgstr ""
+msgstr "Si et plau, comprova les teves entrades i intenta-ho de nou."
#: mediagoblin/user_pages/views.py:297
msgid ""
"Some of the files with this entry seem to be missing. Deleting anyway."
-msgstr ""
+msgstr "Sembla que falten alguns arxius amb aquesta entrada. Tot i aixà s'eliminen."
#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
-msgstr ""
+msgstr "Has esborrat el mitjà "
#: mediagoblin/user_pages/views.py:309
msgid "The media was not deleted because you didn't check that you were sure."
-msgstr ""
+msgstr "El mitjà no s'ha esborrat perque no has marcat que n'estiguessis segur."
#: mediagoblin/user_pages/views.py:317
msgid "You are about to delete another user's media. Proceed with caution."
-msgstr ""
+msgstr "Ets a punt d'esborrar el mitjà d'un altre usuari. Prossegueix amb cautela."
#: mediagoblin/user_pages/views.py:379
msgid "You deleted the item from the collection."
-msgstr ""
+msgstr "Has esborrat l'element de la col.lecció"
#: mediagoblin/user_pages/views.py:383
msgid "The item was not removed because you didn't check that you were sure."
-msgstr ""
+msgstr "L'element no s'ha eliminat perque no has marcat que n'estiguessis segur."
#: mediagoblin/user_pages/views.py:393
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
-msgstr ""
+msgstr "Ets a punt d'esborrar un element de la col.lecció d'un altre usuari. Prossegueix amb cautela."
#: mediagoblin/user_pages/views.py:426
#, python-format
msgid "You deleted the collection \"%s\""
-msgstr ""
+msgstr "Has esborrat la col.lecció \"%s\""
#: mediagoblin/user_pages/views.py:433
msgid ""
"The collection was not deleted because you didn't check that you were sure."
-msgstr ""
+msgstr "La col.lecció no s'ha esborrat perquè no has marcat que n'estiguessis segur."
#: mediagoblin/user_pages/views.py:443
msgid ""
"You are about to delete another user's collection. Proceed with caution."
-msgstr ""
+msgstr "Ets a punt d'esborrar la col.lecció d'un altre usuari. Prossegueix amb cautela."
diff --git a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo
index 23685f41..1e27578b 100644
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 0426e9ed..b098d34d 100644
--- a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po
@@ -5,12 +5,13 @@
# Translators:
# Morten Juhl-Johansen Zölde-Fejér , 2012.
# Olle Jonsson , 2012.
+# Tanja Trudslev , 2012.
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-09-24 14:01-0500\n"
-"PO-Revision-Date: 2012-09-24 18:57+0000\n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -34,41 +35,41 @@ msgstr "Email adresse"
#: mediagoblin/auth/forms.py:51
msgid "Username or email"
-msgstr ""
+msgstr "Brugernavn eller email"
#: mediagoblin/auth/forms.py:58
msgid "Incorrect input"
-msgstr ""
+msgstr "Forkert input"
#: mediagoblin/auth/views.py:55
msgid "Sorry, registration is disabled on this instance."
-msgstr ""
+msgstr "Desværre, registrering er ikke muligt på denne instans"
#: mediagoblin/auth/views.py:75
msgid "Sorry, a user with that name already exists."
-msgstr ""
+msgstr "Desværre, det brugernavn er allerede brugt"
#: mediagoblin/auth/views.py:79
msgid "Sorry, a user with that email address already exists."
-msgstr ""
+msgstr "Desværre, en bruger er allerede oprettet for den email"
#: mediagoblin/auth/views.py:182
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
-msgstr ""
+msgstr "Din email adresse er blevet bekræftet. Du kan nu logge på, ændre din profil, og indsende billeder!"
#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
-msgstr ""
+msgstr "Bekræftelsesnøglen eller brugerid er forkert"
#: mediagoblin/auth/views.py:206
msgid "You must be logged in so we know who to send the email to!"
-msgstr ""
+msgstr "Du er nødt til at være logget ind, så vi ved hvem vi skal emaile!"
#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
-msgstr ""
+msgstr "Du har allerede bekræftet din email adresse!"
#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
@@ -77,23 +78,23 @@ msgstr "Email til godkendelse sendt igen."
#: mediagoblin/auth/views.py:263
msgid ""
"An email has been sent with instructions on how to change your password."
-msgstr ""
+msgstr "En email er blevet sendt med instruktioner til at ændre dit kodeord."
#: mediagoblin/auth/views.py:273
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
-msgstr ""
+msgstr "Vi kunne ikke sende en kodeords nulstillings email da dit brugernavn er inaktivt, eller din konto's email adresse er ikke blevet godkendt."
#: mediagoblin/auth/views.py:285
msgid "Couldn't find someone with that username or email."
-msgstr ""
+msgstr "Vi kunne ikke dit brugernavn eller email."
#: mediagoblin/auth/views.py:333
msgid "You can now log in using your new password."
-msgstr ""
+msgstr "Du kan nu logge ind med dit nye kodeord."
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -101,30 +102,30 @@ msgstr "Titel"
#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
msgid "Description of this work"
-msgstr ""
+msgstr "Beskrivelse af arbejdet"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
-msgstr ""
+msgstr "Du kan bruge\n \n Markdown til formattering."
#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
msgid "Tags"
-msgstr ""
+msgstr "Tags"
#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
-msgstr ""
+msgstr "Separer tags med kommaer."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr ""
@@ -132,16 +133,16 @@ msgstr ""
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
-msgstr ""
+msgstr "Titeldelen af dette medie's adresse. Du behøver normalt ikke ændre dette."
#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
-msgstr ""
+msgstr "Licens"
#: mediagoblin/edit/forms.py:50
msgid "Bio"
-msgstr ""
+msgstr "Bio"
#: mediagoblin/edit/forms.py:56
msgid "Website"
@@ -149,38 +150,38 @@ msgstr "Websted"
#: mediagoblin/edit/forms.py:58
msgid "This address contains errors"
-msgstr ""
+msgstr "Denne adresse indeholder fejl"
#: mediagoblin/edit/forms.py:63
msgid "Old password"
-msgstr ""
+msgstr "Gammelt kodeord"
#: mediagoblin/edit/forms.py:64
msgid "Enter your old password to prove you own this account."
-msgstr ""
+msgstr "Skriv dit gamle kodeord for at bevise det er din konto."
#: mediagoblin/edit/forms.py:67
msgid "New password"
-msgstr ""
+msgstr "Ny kodeord"
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
-msgstr ""
+msgstr "Email mig når andre kommenterer på mine medier"
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
-msgstr ""
+msgstr "Titlen kan ikke være tom"
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
-msgstr ""
+msgstr "Beskrivelse af denne samling"
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
-msgstr ""
+msgstr "Titeldelen af denne samlings's adresse. Du behøver normalt ikke ændre dette."
#: mediagoblin/edit/views.py:65
msgid "An entry with that slug already exists for this user."
@@ -188,41 +189,46 @@ msgstr ""
#: mediagoblin/edit/views.py:86
msgid "You are editing another user's media. Proceed with caution."
+msgstr "Du er ved at ændre en anden brugers' medier. Pas på."
+
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
msgstr ""
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:181
msgid "You are editing a user's profile. Proceed with caution."
-msgstr ""
+msgstr "Du er ved at ændre en bruger's profil. Pas på."
-#: mediagoblin/edit/views.py:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
-msgstr ""
+msgstr "Profilændringer gemt"
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
-msgstr ""
+msgstr "Kontoindstillinger gemt"
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
-msgstr ""
+msgstr "Forkert kodeord"
-#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
#: mediagoblin/user_pages/views.py:215
#, python-format
msgid "You already have a collection called \"%s\"!"
-msgstr ""
+msgstr "Du har allerede en samling ved navn \"%s\"!"
-#: mediagoblin/edit/views.py:292
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:309
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
-msgstr ""
+msgstr "Du er ved at ændre en anden bruger's samling. Pas på."
#: mediagoblin/gmg_commands/theme.py:58
msgid "Cannot link theme... no theme set\n"
-msgstr ""
+msgstr "Kan ikke linke til tema... intet tema sat\n"
#: mediagoblin/gmg_commands/theme.py:71
msgid "No asset directory for this theme\n"
@@ -235,7 +241,7 @@ msgstr ""
#: mediagoblin/media_types/__init__.py:60
#: mediagoblin/media_types/__init__.py:120
msgid "Sorry, I don't support that file type :("
-msgstr ""
+msgstr "Desværre, jeg understøtter ikke den filtype :("
#: mediagoblin/media_types/video/processing.py:35
msgid "Video transcoding failed"
@@ -247,27 +253,27 @@ msgstr ""
#: mediagoblin/plugins/oauth/forms.py:28
msgid "Next URL"
-msgstr ""
+msgstr "Næste URL"
#: mediagoblin/plugins/oauth/forms.py:30
msgid "Allow"
-msgstr ""
+msgstr "Tillad"
#: mediagoblin/plugins/oauth/forms.py:31
msgid "Deny"
-msgstr ""
+msgstr "Forbyd"
#: mediagoblin/plugins/oauth/forms.py:35
msgid "Name"
-msgstr ""
+msgstr "Navn"
#: mediagoblin/plugins/oauth/forms.py:36
msgid "The name of the OAuth client"
-msgstr ""
+msgstr "Navnet af OAuth klienten"
#: mediagoblin/plugins/oauth/forms.py:37
msgid "Description"
-msgstr ""
+msgstr "Beskrivelse"
#: mediagoblin/plugins/oauth/forms.py:39
msgid ""
@@ -277,7 +283,7 @@ msgstr ""
#: mediagoblin/plugins/oauth/forms.py:41
msgid "Type"
-msgstr ""
+msgstr "Type"
#: mediagoblin/plugins/oauth/forms.py:46
msgid ""
@@ -301,15 +307,15 @@ msgstr ""
#: mediagoblin/plugins/oauth/forms.py:67
msgid "This field is required for public clients"
-msgstr ""
+msgstr "Dette felt er nødvendigt for offentlige klienter"
#: mediagoblin/plugins/oauth/views.py:59
msgid "The client {0} has been registered!"
-msgstr ""
+msgstr "Klienten {0} er blevet registreret!"
#: mediagoblin/processing/__init__.py:138
msgid "Invalid file given for media type."
-msgstr ""
+msgstr "Forkert fil for medietypen."
#: mediagoblin/submit/forms.py:26
msgid "File"
@@ -317,58 +323,39 @@ msgstr "Fil"
#: mediagoblin/submit/views.py:57
msgid "You must provide a file."
-msgstr ""
+msgstr "Du må give mig en fil"
#: mediagoblin/submit/views.py:164
msgid "Woohoo! Submitted!"
-msgstr ""
+msgstr "Juhuu! Delt!"
#: 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"
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr "Hovsa!"
-
-#: mediagoblin/templates/mediagoblin/404.html:26
-msgid "There doesn't seem to be a page at this address. Sorry!"
-msgstr ""
-
-#: 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."
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr "MediaGoblin logo"
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
msgstr ""
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
-msgstr ""
+msgid "Verify your email!"
+msgstr "Bekræft din email!"
#: mediagoblin/templates/mediagoblin/base.html:75
#: mediagoblin/templates/mediagoblin/auth/login.html:28
@@ -391,31 +378,56 @@ msgid ""
"href=\"%(source_link)s\">Source code available."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:24
-msgid "Explore"
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:26
-msgid "Hi there, welcome to this MediaGoblin site!"
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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 ""
+
+#: mediagoblin/templates/mediagoblin/root.html:51
+msgid "Explore"
+msgstr "Udforsk"
+
+#: mediagoblin/templates/mediagoblin/root.html:53
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "Hey, velkommen til denne MediaGoblin side!"
+
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
-msgstr ""
+msgstr "For at tilføje dine egne medier, skrive kommentarer, og mere, du kan logge ind med din MediaGoblin konto."
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
-msgstr ""
+msgstr "Har du ikke en endnu? Det er let!"
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
@@ -423,17 +435,10 @@ msgid ""
" Set up MediaGoblin on your own server"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
msgstr ""
-#: 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 ""
-
#: mediagoblin/templates/mediagoblin/admin/panel.html:29
msgid ""
"Here you can track the state of media being processed on this instance."
@@ -542,30 +547,43 @@ msgstr ""
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"
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr "Afbryd"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
msgid "Save changes"
msgstr "Gem ændringer"
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
msgstr ""
@@ -591,13 +609,11 @@ msgstr ""
#: 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 ""
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr ""
@@ -648,7 +664,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
msgstr ""
@@ -692,7 +708,7 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr ""
@@ -701,7 +717,7 @@ msgstr ""
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
msgstr ""
@@ -759,13 +775,8 @@ msgid ""
" %(date)s
"
msgstr ""
-#: 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:192
-msgid "Add attachment"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
@@ -773,11 +784,11 @@ msgstr ""
msgid "Add %(title)s to collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
msgstr ""
@@ -848,41 +859,25 @@ msgstr "Ret profil"
msgid "This user hasn't filled in their profile (yet)."
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
msgid "There doesn't seem to be any media here yet..."
msgstr ""
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
-#, python-format
-msgid ""
-"
\n"
-" %(note)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
@@ -902,7 +897,7 @@ msgstr ""
msgid "Location"
msgstr ""
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
msgstr ""
@@ -941,6 +936,32 @@ msgstr ""
msgid "Could not read the image file."
msgstr ""
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr "Hovsa!"
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:28
msgid "I am sure I want to delete this"
msgstr ""
diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo
index 015a480c..8b3f232a 100644
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 6a1605c3..db464d6e 100644
--- a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
@@ -13,13 +13,14 @@
# , 2011.
# , 2011.
# Rafael Maguiña , 2011.
+# Vinzenz Vietzke , 2012.
# Vinzenz Vietzke , 2011.
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-09-24 14:01-0500\n"
-"PO-Revision-Date: 2012-09-24 18:57+0000\n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: German (http://www.transifex.com/projects/p/mediagoblin/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -102,7 +103,7 @@ 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/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -113,7 +114,7 @@ msgid "Description of this work"
msgstr "Beschreibung des Werkes"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
@@ -129,11 +130,11 @@ msgstr "Schlagwörter"
msgid "Separate tags by commas."
msgstr "Kommaseparierte Schlagwörter"
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Kurztitel"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "Bitte gib einen Kurztitel ein"
@@ -172,24 +173,24 @@ msgstr "Gib dein altes Passwort ein, um zu bestätigen, dass du dieses Konto bes
msgid "New password"
msgstr "Neues Passwort"
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr "Mir eine E-Mail schicken, wenn andere meine Medien kommentieren"
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
-msgstr ""
+msgstr "Der Titel kann nicht leer sein"
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
-msgstr ""
+msgstr "Beschreibung dieser Sammlung"
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
-msgstr ""
+msgstr "Der Titelteil dieser Sammlungsadresse. Du musst ihn normalerweise nicht ändern."
#: mediagoblin/edit/views.py:65
msgid "An entry with that slug already exists for this user."
@@ -199,35 +200,40 @@ msgstr "Diesen Kurztitel hast du bereits vergeben."
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:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
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:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
msgstr "Das Profil wurde aktualisiert"
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
msgstr "Kontoeinstellungen gespeichert"
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
msgstr "Falsches Passwort"
-#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
#: mediagoblin/user_pages/views.py:215
#, python-format
msgid "You already have a collection called \"%s\"!"
-msgstr ""
+msgstr "Du hast bereits eine Sammlung mit Namen \"%s\"!"
-#: mediagoblin/edit/views.py:292
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
-msgstr ""
+msgstr "Eine Sammlung mit diesem Kürzel existiert bereits für diesen Benutzer."
-#: mediagoblin/edit/views.py:309
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
-msgstr ""
+msgstr "Du bearbeitest die Sammlung eines anderen Benutzers. Sei vorsichtig."
#: mediagoblin/gmg_commands/theme.py:58
msgid "Cannot link theme... no theme set\n"
@@ -252,41 +258,41 @@ msgstr "Videokonvertierung fehlgeschlagen"
#: mediagoblin/plugins/oauth/forms.py:26
msgid "Client ID"
-msgstr ""
+msgstr "Client-ID"
#: mediagoblin/plugins/oauth/forms.py:28
msgid "Next URL"
-msgstr ""
+msgstr "Nächste URL"
#: mediagoblin/plugins/oauth/forms.py:30
msgid "Allow"
-msgstr ""
+msgstr "Erlauben"
#: mediagoblin/plugins/oauth/forms.py:31
msgid "Deny"
-msgstr ""
+msgstr "Verweigern"
#: mediagoblin/plugins/oauth/forms.py:35
msgid "Name"
-msgstr ""
+msgstr "Name"
#: mediagoblin/plugins/oauth/forms.py:36
msgid "The name of the OAuth client"
-msgstr ""
+msgstr "Der Name des OAuth-Clients"
#: mediagoblin/plugins/oauth/forms.py:37
msgid "Description"
-msgstr ""
+msgstr "Beschreibung"
#: mediagoblin/plugins/oauth/forms.py:39
msgid ""
"This will be visible to users allowing your\n"
" application to authenticate as them."
-msgstr ""
+msgstr "Dies wird für Benutzer sichtbar sein, die deiner\n Anwendung erlauben, sich als sie zu authentifizieren.."
#: mediagoblin/plugins/oauth/forms.py:41
msgid "Type"
-msgstr ""
+msgstr "Typ"
#: mediagoblin/plugins/oauth/forms.py:46
msgid ""
@@ -296,25 +302,25 @@ msgid ""
" Public - The client can't make confidential\n"
" requests to the GNU MediaGoblin instance (e.g. client-side\n"
" JavaScript client)."
-msgstr ""
+msgstr "Vertraulich - Der Client kann\n Anfragen an die GNU MediaGoblin Instanz stellen, die nicht durch den \n Benutzer-Agent (z.B. serverseitiger Client) unterbunden werden können.
\n Ãffentlich - Der Client kann keine vertraulichen \n Anfragen an die GNU MediaGoblin Instanz stellen (z.B. clientseitiger\n JavaScript Client)."
#: mediagoblin/plugins/oauth/forms.py:53
msgid "Redirect URI"
-msgstr ""
+msgstr "Weiterleitungs-URI"
#: mediagoblin/plugins/oauth/forms.py:55
msgid ""
"The redirect URI for the applications, this field\n"
" is required for public clients."
-msgstr ""
+msgstr "Die Weiterleitungs-URI für die Anwendung, dieses Feld\n ist Pflicht für öffentliche Clients."
#: mediagoblin/plugins/oauth/forms.py:67
msgid "This field is required for public clients"
-msgstr ""
+msgstr "Dieses Feld ist Pflicht für öffentliche Clients"
#: mediagoblin/plugins/oauth/views.py:59
msgid "The client {0} has been registered!"
-msgstr ""
+msgstr "Client {0} wurde registriert!"
#: mediagoblin/processing/__init__.py:138
msgid "Invalid file given for media type."
@@ -335,49 +341,30 @@ msgstr "Yeeeaaah! Geschafft!"
#: 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:25
-msgid "Oops!"
-msgstr "Hoppla!"
-
-#: 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:28
-msgid ""
-"If you're sure the address is correct, maybe the page you're looking for has"
-" been moved or deleted."
-msgstr "Wenn du sicher bist, dass die Adresse stimmt, wurde die Seite eventuell verschoben oder gelöscht."
+msgstr "Sammlung \"%s\" hinzugefügt!"
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr "MediaGoblin-Logo"
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr "Bitte bestätige deine E-Mail-Adresse!"
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
-msgstr "+ Medien hinzufügen"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
-msgstr "Dein Profil ansehen"
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
+msgstr "Medien hinzufügen"
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
-msgstr "Abmelden"
+msgid "Verify your email!"
+msgstr "Bitte bestätige deine E-Mail-Adresse!"
#: mediagoblin/templates/mediagoblin/base.html:75
#: mediagoblin/templates/mediagoblin/auth/login.html:28
@@ -400,31 +387,56 @@ msgid ""
"href=\"%(source_link)s\">Source code available."
msgstr "Veröffentlicht unter der AGPL (Quellcode)."
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr "Kontoeinstellungen ändern"
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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/root.html:51
msgid "Explore"
msgstr "Entdecken"
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr "Hallo du, willkommen auf dieser MediaGoblin-Seite!"
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
msgstr "Diese Seite setzt MediaGoblin ein, eine groÃartige Software für Medienhosting."
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr "Melde dich mit deinem MediaGoblin-Konto an, um eigene Medien hinzuzufügen, zu kommentieren und mehr."
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
msgstr "Hast du noch keinen? Das geht ganz einfach!"
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
@@ -432,17 +444,10 @@ msgid ""
" Set up MediaGoblin on your own server"
msgstr "Registriere dich auf dieser Seite oder Installiere MediaGoblin auf deinem eigenen Server"
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
msgstr "Neuste Medien"
-#: 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:29
msgid ""
"Here you can track the state of media being processed on this instance."
@@ -549,32 +554,45 @@ msgstr "Hallo %(username)s,\n\num dein Konto bei GNU MediaGoblin zu aktivieren,
#: mediagoblin/templates/mediagoblin/edit/attachments.html:35
#, python-format
msgid "Editing attachments for %(media_title)s"
-msgstr ""
+msgstr "Bearbeite Anhänge von %(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 "%(media_title)s bearbeiten"
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
+msgstr "Anhänge"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr "Anhang hinzufügen"
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr "Abbrechen"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: 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.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_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
msgstr "%(username)ss Kontoeinstellungen ändern"
@@ -582,7 +600,7 @@ msgstr "%(username)ss Kontoeinstellungen ändern"
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
-msgstr ""
+msgstr "Bearbeite %(collection_title)s"
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
@@ -600,13 +618,11 @@ msgstr "Medien mit Schlagwort: %(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 "Download"
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr "Original"
@@ -653,11 +669,11 @@ msgstr "WebM-Datei (640p; VP8/Vorbis)"
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
-msgstr ""
+msgstr "Eine Sammlung hinzufügen"
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
msgstr "Hinzufügen"
@@ -669,12 +685,12 @@ msgstr "Deine Medien"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
#, python-format
msgid "%(collection_title)s (%(username)s's collection)"
-msgstr ""
+msgstr "%(collection_title)s (%(username)s's collection)"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
#, python-format
msgid "%(collection_title)s by %(username)s"
-msgstr ""
+msgstr "%(collection_title)s by %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
@@ -692,7 +708,7 @@ msgid ""
"\n"
" %(collection_description)s\n"
"
"
-msgstr ""
+msgstr "\n %(collection_description)s\n
"
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -701,18 +717,18 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
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 ""
+msgstr "Wirklich %(media_title)s aus %(collection_title)s entfernen?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
-msgstr ""
+msgstr "Entfernen"
#: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
#, python-format
@@ -768,27 +784,22 @@ msgid ""
" %(date)s
"
msgstr "Veröffentlicht am
\n %(date)s
"
-#: 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:192
-msgid "Add attachment"
-msgstr "Anhang hinzufügen"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
+msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
#, python-format
msgid "Add %(title)s to collection"
-msgstr ""
+msgstr "%(title)s zur Sammlung hinzufügen"
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
-msgstr ""
+msgstr "+"
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
-msgstr ""
+msgstr "Eine neue Sammlung hinzufügen"
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
msgid ""
@@ -857,47 +868,31 @@ msgstr "Profil bearbeiten"
msgid "This user hasn't filled in their profile (yet)."
msgstr "Dieser Benutzer hat (noch) keine Daten in seinem Profil."
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr "Kontoeinstellungen ändern"
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr "Alle Medien von %(username)s anschauen"
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
msgstr "Hier erscheinen deine Medien, sobald du etwas hochgeladen hast."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
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 ""
-"
\n"
-" %(note)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
#, python-format
msgid "In collections (%(collected)s)"
-msgstr ""
+msgstr "In den Sammlungen (%(collected)s)"
#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
msgid "feed icon"
@@ -911,7 +906,7 @@ msgstr "Atom-Feed"
msgid "Location"
msgstr "Aufnahmeort"
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
msgstr "In OpenStreetMap öffnen"
@@ -950,21 +945,47 @@ msgstr "Schlagwörter"
msgid "Could not read the image file."
msgstr "Die Bilddatei konnte nicht gelesen werden."
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr "Hoppla!"
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
#: 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 ""
+msgstr "Ich bin sicher, dass ich dieses Objekt aus der Sammlung entfernen möchte"
#: mediagoblin/user_pages/forms.py:35
msgid "-- Select --"
-msgstr ""
+msgstr "-- Auswählen --"
#: mediagoblin/user_pages/forms.py:37
msgid "Include a note"
-msgstr ""
+msgstr "Notiz anfügen"
#: mediagoblin/user_pages/lib.py:56
msgid "commented on your post"
@@ -980,21 +1001,21 @@ msgstr "Dein Kommentar wurde gesendet!"
#: mediagoblin/user_pages/views.py:235
msgid "You have to select or add a collection"
-msgstr ""
+msgstr "Du musst eine Sammlung auswählen oder hinzufügen"
#: mediagoblin/user_pages/views.py:243
#, python-format
msgid "\"%s\" already in collection \"%s\""
-msgstr ""
+msgstr "\"%s\" ist bereits in der Sammlung \"%s\""
#: mediagoblin/user_pages/views.py:258
#, python-format
msgid "\"%s\" added to collection \"%s\""
-msgstr ""
+msgstr "\"%s\" zur Sammlung \"%s\" hinzugefügt"
#: mediagoblin/user_pages/views.py:266
msgid "Please check your entries and try again."
-msgstr ""
+msgstr "Bitte prüfe deinen Einträge und versuche erneut."
#: mediagoblin/user_pages/views.py:297
msgid ""
@@ -1015,29 +1036,29 @@ msgstr "Du versuchst Medien eines anderen Nutzers zu löschen. Sei bitte vorsich
#: mediagoblin/user_pages/views.py:379
msgid "You deleted the item from the collection."
-msgstr ""
+msgstr "Du hast das Objekt aus der Sammlung gelöscht."
#: mediagoblin/user_pages/views.py:383
msgid "The item was not removed because you didn't check that you were sure."
-msgstr ""
+msgstr "Das Objekt wurde nicht aus der Sammlung entfernt, weil du nicht bestätigt hast, dass du dir sicher bist."
#: mediagoblin/user_pages/views.py:393
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
-msgstr ""
+msgstr "Du bist dabei ein Objekt aus der Sammlung eines anderen Nutzers zu entfernen. Sei vorsichtig."
#: mediagoblin/user_pages/views.py:426
#, python-format
msgid "You deleted the collection \"%s\""
-msgstr ""
+msgstr "Du hast die Sammlung \"%s\" gelöscht"
#: mediagoblin/user_pages/views.py:433
msgid ""
"The collection was not deleted because you didn't check that you were sure."
-msgstr ""
+msgstr "Die Sammlung wurde nicht gelöscht, weil du nicht bestätigt hast, dass du dir sicher bist."
#: mediagoblin/user_pages/views.py:443
msgid ""
"You are about to delete another user's collection. Proceed with caution."
-msgstr ""
+msgstr "Du bist dabei eine Sammlung eines anderen Nutzers zu entfernen. Sei vorsichtig."
diff --git a/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po
index 3e589f71..6ebe3f09 100644
--- 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-09-24 14:01-0500\n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -89,7 +89,7 @@ msgstr ""
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -100,7 +100,7 @@ msgid "Description of this work"
msgstr ""
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
@@ -117,11 +117,11 @@ msgstr ""
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr ""
@@ -160,20 +160,20 @@ msgstr ""
msgid "New password"
msgstr ""
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr ""
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
@@ -187,33 +187,38 @@ msgstr ""
msgid "You are editing another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
msgid "You are editing a user's profile. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
msgstr ""
-#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
#: mediagoblin/user_pages/views.py:215
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:292
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:309
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
@@ -329,46 +334,27 @@ msgstr ""
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/404.html:24
-msgid "Image of 404 goblin stressing out"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/404.html:26
-msgid "There doesn't seem to be a page at this address. Sorry!"
-msgstr ""
-
-#: 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."
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
msgstr ""
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
+msgid "Verify your email!"
msgstr ""
#: mediagoblin/templates/mediagoblin/base.html:75
@@ -392,31 +378,56 @@ msgid ""
" href=\"%(source_link)s\">Source code available."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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 ""
+
+#: mediagoblin/templates/mediagoblin/root.html:51
msgid "Explore"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, "
"an extraordinarily great piece of media hosting software."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your"
" MediaGoblin account."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an "
@@ -427,17 +438,10 @@ msgid ""
"your own server"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
msgstr ""
-#: 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 ""
-
#: mediagoblin/templates/mediagoblin/admin/panel.html:29
msgid "Here you can track the state of media being processed on this instance."
msgstr ""
@@ -545,30 +549,43 @@ msgstr ""
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"
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
msgid "Save changes"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
msgstr ""
@@ -594,13 +611,11 @@ msgstr ""
#: 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 ""
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr ""
@@ -651,7 +666,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
msgstr ""
@@ -695,7 +710,7 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr ""
@@ -704,7 +719,7 @@ msgstr ""
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
msgstr ""
@@ -763,13 +778,8 @@ msgid ""
" %(date)s
"
msgstr ""
-#: 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:192
-msgid "Add attachment"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
@@ -777,11 +787,11 @@ msgstr ""
msgid "Add %(title)s to collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
msgstr ""
@@ -850,41 +860,25 @@ msgstr ""
msgid "This user hasn't filled in their profile (yet)."
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
msgid "There doesn't seem to be any media here yet..."
msgstr ""
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
-#, python-format
-msgid ""
-"
\n"
-" %(note)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
@@ -904,7 +898,7 @@ msgstr ""
msgid "Location"
msgstr ""
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
msgstr ""
@@ -943,6 +937,32 @@ msgstr ""
msgid "Could not read the image file."
msgstr ""
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr ""
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're "
+"sure the address is correct, maybe the page you're looking for has been "
+"moved or deleted."
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:28
msgid "I am sure I want to delete this"
msgstr ""
diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo
index dbd2bc4d..859a7868 100644
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 2bfb4319..690857b8 100644
--- a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-09-24 11:41-0500\n"
-"PO-Revision-Date: 2012-09-24 18:27+0000\n"
-"Last-Translator: aleksejrs \n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
+"Last-Translator: cwebber \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -94,7 +94,7 @@ 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/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -105,7 +105,7 @@ msgid "Description of this work"
msgstr "Priskribo de Äi tiu verko"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
@@ -121,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:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "La distingiga adresparto"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "La distingiga adresparto ne povas esti malplena"
@@ -164,20 +164,20 @@ msgstr "Enigu vian malnovan pasvorton por pruvi, ke Äi tiu konto estas via."
msgid "New password"
msgstr "La nova pasvorto"
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr "RetpoÅtu min kiam aliaj komentas pri miaj alÅutaĵoj."
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
-msgstr "Priskribo de Äi tiu kolekto"
+msgstr "Priskribo de la kolekto"
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
@@ -191,34 +191,40 @@ msgstr "Äi tiu uzanto jam havas dosieron kun tiu distingiga adresparto."
msgid "You are editing another user's media. Proceed with caution."
msgstr "Vi priredaktas dosieron de alia uzanto. Agu singardeme."
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Vi redaktas profilon de alia uzanto. Agu singardeme."
-#: mediagoblin/edit/views.py:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
msgstr "ProfilÅanÄoj estis konservitaj"
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
msgstr "Kontagordoj estis konservitaj"
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
msgstr "MalÄusta pasvorto"
-#: mediagoblin/edit/views.py:287
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
+#: mediagoblin/user_pages/views.py:215
#, python-format
-msgid "You already have a collection called \"%s\"!title"
-msgstr "Vi jam havas kolekton kun la nomo «%s»!title"
+msgid "You already have a collection called \"%s\"!"
+msgstr "Vi jam havas kolekton kun la nomo «%s»!"
-#: mediagoblin/edit/views.py:290
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
msgstr "Äi tiu uzanto jam havas kolekton kun tiu distingiga adresparto."
-#: mediagoblin/edit/views.py:307
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
-msgstr ""
+msgstr "Vi redaktas kolekton de alia uzanto. Agu singardeme."
#: mediagoblin/gmg_commands/theme.py:58
msgid "Cannot link theme... no theme set\n"
@@ -323,57 +329,33 @@ msgstr "Vi devas provizi dosieron."
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."
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr "Oj!"
-
-#: mediagoblin/templates/mediagoblin/404.html:26
-msgid "There doesn't seem to be a page at this address. Sorry!"
-msgstr "VerÅajne Äe Äi tiu adreso ne estas paÄo. Ni bedaÅras!"
-
-#: 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."
-msgstr "Se vi estas certa, ke la adreso estas Äusta, eble la serÄata de vi paÄo estis movita aÅ forigita."
+msgstr "Kolekto «%s» aldonitas!"
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr "Emblemo de MediaGoblin"
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr "Konfirmu viecon de la retpoÅtadreso!"
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
-msgstr "+ Aldoni dosieron"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
-msgstr "Vidi vian profilon"
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
+msgstr "Aldoni dosieron"
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
-msgstr "Elsaluti"
+msgid "Verify your email!"
+msgstr "Konfirmu viecon de la retpoÅtadreso!"
#: mediagoblin/templates/mediagoblin/base.html:75
#: mediagoblin/templates/mediagoblin/auth/login.html:28
@@ -396,31 +378,56 @@ msgid ""
"href=\"%(source_link)s\">Source code available."
msgstr "Disponigita laÅ la permesilo AGPL. Haveblasfontotekstaro."
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr "ÅanÄi kontagordojn"
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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 "Kontrolejo pri dosierpreparado."
+
+#: mediagoblin/templates/mediagoblin/root.html:51
msgid "Explore"
msgstr "ÄirkaÅrigardi"
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr "Saluton, kaj bonvenon al Äi tiu MediaGoblina retpaÄaro!"
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
msgstr "Äi tiu retpaÄaro funkcias per MediaGoblin, eksterordinare bonega programaro por gastigado de aÅdâvidâdosieroj."
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr "Por aldoni viajn proprajn dosierojn, afiÅi komentariojn ktp, vi povas ensaluti je via MediaGoblina konto."
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
msgstr "Äu vi ankoraÅ ne havas tian? Ne malÄoju!"
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
@@ -428,17 +435,10 @@ msgid ""
" Set up MediaGoblin on your own server"
msgstr "Kreu konton en Äi tiu retejo\n aÅ\n ekfunkciigu MediaGoblinâon en via propra servilo"
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
msgstr "Laste aldonitaj dosieroj"
-#: 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 "Kontrolejo pri dosierpreparado."
-
#: mediagoblin/templates/mediagoblin/admin/panel.html:29
msgid ""
"Here you can track the state of media being processed on this instance."
@@ -547,30 +547,43 @@ msgstr "Sal %(username)s,\n\npor aktivigi vian GNU MediaGoblin konton, malfermu
msgid "Editing attachments for %(media_title)s"
msgstr "Aldoni kundosierojn por %(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 "Priredaktado de %(media_title)s"
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
+msgstr "Kundosieroj"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr "Aldoni kundosieron"
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr "Nuligi"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
msgid "Save changes"
msgstr "Konservi ÅanÄojn"
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr "Priredaktado de %(media_title)s"
+
#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
msgstr "ÅanÄado de kontagordoj de %(username)s"
@@ -596,13 +609,11 @@ msgstr "Dosieroj kun etikedo: %(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 "ElÅuti"
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr "Originalo"
@@ -649,11 +660,11 @@ msgstr "la WebM-dosieron (640p; VP8/Vorbis)"
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
-msgstr ""
+msgstr "Aldonado de kolekto"
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
msgstr "Aldoni"
@@ -665,12 +676,12 @@ msgstr "Aldono de via dosiero"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
#, python-format
msgid "%(collection_title)s (%(username)s's collection)"
-msgstr ""
+msgstr "%(collection_title)s (kolekto de %(username)s)"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
#, python-format
msgid "%(collection_title)s by %(username)s"
-msgstr ""
+msgstr "%(collection_title)s de %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
@@ -697,18 +708,18 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
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 ""
+msgstr "Äu vere forigi %(media_title)s el %(collection_title)s?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
-msgstr ""
+msgstr "Forigi"
#: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
#, python-format
@@ -764,27 +775,22 @@ msgid ""
" %(date)s
"
msgstr "Aldonita je
\n la %(date)s
"
-#: 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:192
-msgid "Add attachment"
-msgstr "Aldoni kundosieron"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
+msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
#, python-format
msgid "Add %(title)s to collection"
-msgstr ""
+msgstr "Aldonado de %(title)s al kolekto"
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
-msgstr ""
+msgstr "Aldoni novan kolekton"
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
msgid ""
@@ -853,47 +859,31 @@ msgstr "Redakti profilon"
msgid "This user hasn't filled in their profile (yet)."
msgstr "Äi tiu uzanto ne jam aldonis informojn pri si."
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr "ÅanÄi kontagordojn"
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr "Rigardi Äiujn dosierojn de %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
msgstr "Äuste Äi tie aperos viaj dosieroj, sed vi Åajne ankoraÅ nenion alÅutis."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
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 ""
-"
\n"
-" %(note)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
#, python-format
msgid "In collections (%(collected)s)"
-msgstr ""
+msgstr "En %(collected)s kolekto(j)"
#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
msgid "feed icon"
@@ -907,7 +897,7 @@ msgstr "Atom-a informfluo"
msgid "Location"
msgstr "Loko"
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
msgstr "Vidi sur OpenStreetMap"
@@ -946,21 +936,47 @@ msgstr "Markita per"
msgid "Could not read the image file."
msgstr "Malsukcesis lego de la bildodosiero"
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr "Oj!"
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
#: 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 ""
+msgstr "Jes, mi volas forigi Äi tiun dosieron el la kolekto"
#: mediagoblin/user_pages/forms.py:35
msgid "-- Select --"
-msgstr ""
+msgstr "-- Elektu --"
#: mediagoblin/user_pages/forms.py:37
msgid "Include a note"
-msgstr ""
+msgstr "Rimarko"
#: mediagoblin/user_pages/lib.py:56
msgid "commented on your post"
@@ -976,17 +992,17 @@ msgstr "Via komento estis afiÅita!"
#: mediagoblin/user_pages/views.py:235
msgid "You have to select or add a collection"
-msgstr ""
+msgstr "Necesas elekti aÅ aldoni kolekton"
#: mediagoblin/user_pages/views.py:243
#, python-format
msgid "\"%s\" already in collection \"%s\""
-msgstr ""
+msgstr "«%s» jam estas en la kolekto «%s»"
#: mediagoblin/user_pages/views.py:258
#, python-format
msgid "\"%s\" added to collection \"%s\""
-msgstr ""
+msgstr "«%s» estis aldonita al la kolekto «%s»"
#: mediagoblin/user_pages/views.py:266
msgid "Please check your entries and try again."
@@ -1011,29 +1027,29 @@ 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 ""
+msgstr "Vi forigis la dosieron el la kolekto."
#: mediagoblin/user_pages/views.py:383
msgid "The item was not removed because you didn't check that you were sure."
-msgstr ""
+msgstr "La dosiero ne estis forigita, Äar vi ne konfirmis vian certecon per la markilo."
#: mediagoblin/user_pages/views.py:393
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
-msgstr ""
+msgstr "Vi estas forigonta dosieron el kolekto de alia uzanto. Agu singardeme."
#: mediagoblin/user_pages/views.py:426
#, python-format
msgid "You deleted the collection \"%s\""
-msgstr ""
+msgstr "Vi forigis la kolekton «%s»"
#: mediagoblin/user_pages/views.py:433
msgid ""
"The collection was not deleted because you didn't check that you were sure."
-msgstr ""
+msgstr "La kolekto ne estis forigita, Äar vi ne konfirmis vian certecon per la markilo."
#: mediagoblin/user_pages/views.py:443
msgid ""
"You are about to delete another user's collection. Proceed with caution."
-msgstr ""
+msgstr "Vi estas forigonta kolekton de alia uzanto. Agu singardeme."
diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo
index b06a995e..9dc7a9b3 100644
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 1429f887..e4087a20 100644
--- a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
@@ -18,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-09-24 11:41-0500\n"
-"PO-Revision-Date: 2012-09-24 17:10+0000\n"
-"Last-Translator: Elesa \n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
+"Last-Translator: cwebber \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"
@@ -102,7 +102,7 @@ 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/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -113,7 +113,7 @@ msgid "Description of this work"
msgstr "Descripción de esta obra"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
@@ -129,11 +129,11 @@ msgstr "Etiquetas"
msgid "Separate tags by commas."
msgstr "Separa las etiquetas por comas."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Ficha"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "La ficha no puede estar vacÃa"
@@ -172,20 +172,20 @@ msgstr "Escriba la anterior contraseña para demostrar que esta cuenta te perten
msgid "New password"
msgstr "Nueva contraseña"
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr "EnvÃame un correo cuando otros escriban comentarios sobre mi contenido"
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr "El tÃtulo no puede estar vacÃo"
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
msgstr "Descripción de esta colección"
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
@@ -199,32 +199,38 @@ msgstr "Una entrada con esa ficha ya existe para este usuario."
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:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
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:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
msgstr "Los cambios de perfil fueron salvados"
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
msgstr "las configuraciones de cuenta fueron salvadas"
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
msgstr "Contraseña incorrecta"
-#: mediagoblin/edit/views.py:287
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
+#: mediagoblin/user_pages/views.py:215
#, python-format
-msgid "You already have a collection called \"%s\"!title"
-msgstr "Ya tienes una colección llamada \"%s\"!title"
+msgid "You already have a collection called \"%s\"!"
+msgstr "¡Ya tienes una colección llamada \"%s\"!"
-#: mediagoblin/edit/views.py:290
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
msgstr "Una colección con esa ficha ya existe para este usuario/a."
-#: mediagoblin/edit/views.py:307
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
msgstr "Estás editando la colección de otro usuario/a. Ten cuidado."
@@ -331,57 +337,33 @@ msgstr "Debes proporcionar un archivo."
msgid "Woohoo! Submitted!"
msgstr "¡Yujú! ¡Enviado!"
-#: mediagoblin/submit/views.py:211 mediagoblin/user_pages/views.py:215
-#, python-format
-msgid "You already have a collection called \"%s\"!"
-msgstr "¡Ya tienes una colección llamada \"%s\"!"
-
#: mediagoblin/submit/views.py:215
#, python-format
msgid "Collection \"%s\" added!"
msgstr "¡Colección \"%s\" añadida!"
-#: 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:25
-msgid "Oops!"
-msgstr "¡Ups!"
-
-#: 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 sentimos!"
-
-#: 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."
-msgstr "Si estás seguro que la dirección es correcta, puede ser que la pagina haya sido movida o borrada."
-
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr "Logo de MediaGoblin"
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr "¡Verifica tu email!"
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
-msgstr "+Agregar contenido"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
-msgstr "+ Añadir colección"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
-msgstr "Ver tu perfil"
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
+msgstr "Añadir contenido"
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
-msgstr "Salir "
+msgid "Verify your email!"
+msgstr "¡Verifica tu email!"
#: mediagoblin/templates/mediagoblin/base.html:75
#: mediagoblin/templates/mediagoblin/auth/login.html:28
@@ -404,31 +386,56 @@ msgid ""
"href=\"%(source_link)s\">Source code available."
msgstr "Publicado bajo la AGPL. Código fuente disponible."
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr "Cambiar la configuración de la cuenta"
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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/root.html:51
msgid "Explore"
msgstr "Explorar"
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr "Hola, ¡bienvenido a este sitio de MediaGoblin!"
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
msgstr "Este sitio está montado con MediaGoblin, un extraordinario programa libre para alojar, gestionar y compartir contenido multimedia."
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr "Para añadir tus propios contenidos, dejar comentarios y más, puedes iniciar sesión con tu cuenta de MediaGoblin."
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
msgstr "¿Aún no tienes una? ¡Es fácil!"
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
@@ -436,17 +443,10 @@ msgid ""
" Set up MediaGoblin on your own server"
msgstr "Crea una cuenta en este sitio\n o\n Instala Mediagoblin en tu propio servidor"
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
msgstr "El contenido más reciente"
-#: 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:29
msgid ""
"Here you can track the state of media being processed on this instance."
@@ -555,30 +555,43 @@ msgstr "Hola %(username)s,\n\npara activar tu cuenta de GNU MediaGoblin, abre la
msgid "Editing attachments for %(media_title)s"
msgstr "Editando archivos adjuntos a %(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/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
+msgstr "Adjuntos"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr "Agregar adjunto"
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr "Cancelar"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: 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.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_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
msgstr "Cambio de %(username)s la configuración de la cuenta "
@@ -604,13 +617,11 @@ msgstr "Contenido etiquetado 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 "Descargar"
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr "Original"
@@ -661,7 +672,7 @@ msgstr "Añadir una colección"
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
msgstr "Añadir "
@@ -705,7 +716,7 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "Eliminar permanentemente"
@@ -714,7 +725,7 @@ msgstr "Eliminar permanentemente"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr "¿Realmente quieres quitar %(media_title)s de %(collection_title)s?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
msgstr "Quitar"
@@ -772,25 +783,20 @@ msgid ""
" %(date)s
"
msgstr "Añadido en
\n %(date)s
"
-#: 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:192
-msgid "Add attachment"
-msgstr "Agregar adjunto"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
+msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
#, python-format
msgid "Add %(title)s to collection"
msgstr "Añadir %(title)s a la colección"
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
msgstr "+"
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
msgstr "Añadir una nueva colección"
@@ -861,42 +867,26 @@ msgstr "Editar perfil"
msgid "This user hasn't filled in their profile (yet)."
msgstr "Este usuario (todavÃa) no ha completado su perfil."
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr "Cambiar la configuración de la cuenta"
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr "Ver todo el contenido de %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
msgstr "Aquà es donde estará ubicado tu contenido, pero parece que aún no has agregado nada."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
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 ""
-"
\n"
-" %(note)s"
-msgstr "
â %(note)s"
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
-msgstr "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
+msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
#, python-format
@@ -915,7 +905,7 @@ msgstr "Atom feed"
msgid "Location"
msgstr "Locación"
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
msgstr "Ver en OpenStreetMap"
@@ -954,6 +944,32 @@ msgstr "Marcado con"
msgid "Could not read the image file."
msgstr "No se pudo leer el archivo de imagen."
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr "¡Ups!"
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:28
msgid "I am sure I want to delete this"
msgstr "Estoy seguro de que quiero borrar esto"
diff --git a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo
index 4996877b..6aea4688 100644
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 2037f36e..3c69a108 100644
--- 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-09-24 14:01-0500\n"
-"PO-Revision-Date: 2012-09-24 18:57+0000\n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -92,7 +92,7 @@ msgstr ""
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -103,7 +103,7 @@ msgid "Description of this work"
msgstr ""
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
@@ -119,11 +119,11 @@ msgstr "برÚسب"
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr ""
@@ -162,20 +162,20 @@ msgstr ""
msgid "New password"
msgstr ""
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr ""
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
@@ -189,33 +189,38 @@ msgstr ""
msgid "You are editing another user's media. Proceed with caution."
msgstr "Ø´Ù
ا در Øا٠ÙÛراÛØ´ رساÙ٠کاربر دÛÚ¯Ø±Û ÙستÛد.با اØتÛاط عÙ
Ù Ú©ÙÛد"
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Ø´Ù
ا در Øا٠ÙÛراÛØ´ ÙÙ
اÛ٠کاربر دÛÚ¯Ø±Û ÙستÛد.با اØتÛاط عÙ
Ù Ú©ÙÛد."
-#: mediagoblin/edit/views.py:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
msgstr ""
-#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
#: mediagoblin/user_pages/views.py:215
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:292
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:309
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
@@ -327,46 +332,27 @@ msgstr "ÙÙرا!ثبت شد!"
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/404.html:24
-msgid "Image of 404 goblin stressing out"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr "اÙÙ"
-
-#: mediagoblin/templates/mediagoblin/404.html:26
-msgid "There doesn't seem to be a page at this address. Sorry!"
-msgstr "Ù
تاسÙاÙ٠ب٠Ùظر ÙÙ
Û Ø±Ø³Ø¯ Ú©Ù ÚÙÛ٠صÙØÙ Ø§Û Ø¯Ø± اÛ٠آدرس ÙجÙد داشت٠باشد!"
-
-#: 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."
-msgstr "اگر Ù
Ø·Ù
ÙÙ ÙستÛ٠ک٠آدرس درست استØÙ
Ù
ک٠است صÙØÙ Ø§Û Ú©Ù Ø´Ù
ا Ø¢Ùرا جستج٠Ù
Û Ú©ÙÛد اÙتÙا٠داد٠شد٠٠Ûا Øذ٠شد٠باشد."
-
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr "ÙÙÚ¯Ù Ù
دÛاگÙبÙÛÙ"
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
msgstr ""
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
+msgid "Verify your email!"
msgstr ""
#: mediagoblin/templates/mediagoblin/base.html:75
@@ -390,31 +376,56 @@ msgid ""
"href=\"%(source_link)s\">Source code available."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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 "Ù¾Ù٠رسÛØ¯Ú¯Û Ø¨Ù Ø±Ø³Ø§ÙÙ Ùا"
+
+#: mediagoblin/templates/mediagoblin/root.html:51
msgid "Explore"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
@@ -422,17 +433,10 @@ msgid ""
" Set up MediaGoblin on your own server"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
msgstr ""
-#: 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 "Ù¾Ù٠رسÛØ¯Ú¯Û Ø¨Ù Ø±Ø³Ø§ÙÙ Ùا"
-
#: mediagoblin/templates/mediagoblin/admin/panel.html:29
msgid ""
"Here you can track the state of media being processed on this instance."
@@ -541,30 +545,43 @@ msgstr "سÙاÙ
%(username)s,\n\nØ¨Ø±Ø§Û ÙØ¹Ø§Ù Ø³Ø§Ø²Û Ø´Ùاس٠کارب
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"
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr "اÙصراÙ"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
msgid "Save changes"
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"
+
#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
msgstr ""
@@ -590,13 +607,11 @@ msgstr ""
#: 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 ""
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr ""
@@ -647,7 +662,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
msgstr ""
@@ -691,7 +706,7 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr ""
@@ -700,7 +715,7 @@ msgstr ""
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
msgstr ""
@@ -758,13 +773,8 @@ msgid ""
" %(date)s
"
msgstr ""
-#: 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:192
-msgid "Add attachment"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
@@ -772,11 +782,11 @@ msgstr ""
msgid "Add %(title)s to collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
msgstr ""
@@ -847,41 +857,25 @@ msgstr "ÙÛراÛØ´ ÙÙ
اÛÙ"
msgid "This user hasn't filled in their profile (yet)."
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr "ÙÙ
اÛØ´ تÙ
اÙ
Û Ø±Ø³Ø§ÙÙ ÙØ§Û %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
msgid "There doesn't seem to be any media here yet..."
msgstr ""
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
-#, python-format
-msgid ""
-"
\n"
-" %(note)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
@@ -901,7 +895,7 @@ msgstr ""
msgid "Location"
msgstr ""
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
msgstr ""
@@ -940,6 +934,32 @@ msgstr ""
msgid "Could not read the image file."
msgstr ""
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr "اÙÙ"
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:28
msgid "I am sure I want to delete this"
msgstr ""
diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo
index 8262b37f..6b7cb599 100644
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 560484bb..6ce86ae8 100644
--- a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po
@@ -4,6 +4,7 @@
#
# Translators:
# , 2011.
+# , 2012.
# , 2011.
# , 2011.
# , 2011.
@@ -14,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-09-24 14:01-0500\n"
-"PO-Revision-Date: 2012-09-24 18:57+0000\n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: French (http://www.transifex.com/projects/p/mediagoblin/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -39,11 +40,11 @@ msgstr "Adresse e-mail"
#: mediagoblin/auth/forms.py:51
msgid "Username or email"
-msgstr ""
+msgstr "Nom d'utilisateur ou email"
#: mediagoblin/auth/forms.py:58
msgid "Incorrect input"
-msgstr ""
+msgstr "Entrée incorrecte"
#: mediagoblin/auth/views.py:55
msgid "Sorry, registration is disabled on this instance."
@@ -82,7 +83,7 @@ msgstr "E-mail de vérification renvoyé."
#: mediagoblin/auth/views.py:263
msgid ""
"An email has been sent with instructions on how to change your password."
-msgstr ""
+msgstr "Un email contenant les instructions pour changer votre mot de passe viens de vous être envoyé"
#: mediagoblin/auth/views.py:273
msgid ""
@@ -92,13 +93,13 @@ msgstr "Impossible d'envoyer un email de récupération de mot de passe : votre
#: mediagoblin/auth/views.py:285
msgid "Couldn't find someone with that username or email."
-msgstr ""
+msgstr "Impossible de trouver un utilisateur avec ce nom ou cette email."
#: mediagoblin/auth/views.py:333
msgid "You can now log in using your new password."
-msgstr ""
+msgstr "Vous pouvez maintenant vous connecter avec votre nouveau mot de passe."
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -109,13 +110,13 @@ msgid "Description of this work"
msgstr "Descriptif pour ce travail"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
-msgstr ""
+msgstr "Vous pouvez utiliser\n \n Markdown pour le formattage."
#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
msgid "Tags"
@@ -123,13 +124,13 @@ msgstr "Tags"
#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
-msgstr ""
+msgstr "Séparez les champs avec des virgules."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Légende"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "La légende ne peut pas être laissée vide."
@@ -137,12 +138,12 @@ msgstr "La légende ne peut pas être laissée vide."
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
-msgstr ""
+msgstr "Le titre présent dans l'URL du média. Vous n'avez généralement pas besoin de le modifier"
#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
-msgstr ""
+msgstr "Licence"
#: mediagoblin/edit/forms.py:50
msgid "Bio"
@@ -154,7 +155,7 @@ msgstr "Site web"
#: mediagoblin/edit/forms.py:58
msgid "This address contains errors"
-msgstr ""
+msgstr "Cette adresse contiens des erreurs"
#: mediagoblin/edit/forms.py:63
msgid "Old password"
@@ -162,30 +163,30 @@ msgstr "Ancien mot de passe."
#: mediagoblin/edit/forms.py:64
msgid "Enter your old password to prove you own this account."
-msgstr ""
+msgstr "Entrez votre ancien mot de passe pour prouver que vous êtes bien le propriétaire de ce compte."
#: mediagoblin/edit/forms.py:67
msgid "New password"
-msgstr ""
+msgstr "Nouveau mot de passe"
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
-msgstr ""
+msgstr "Me prévenir par email lorsque d'autres commentent mes médias"
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
-msgstr ""
+msgstr "Le titre ne peut être vide"
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
-msgstr ""
+msgstr "Description de cette collection"
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
-msgstr ""
+msgstr "Le titre affiché dans l'URL de la collection. Vous n'avez généralement pas besoin d'y toucher."
#: mediagoblin/edit/views.py:65
msgid "An entry with that slug already exists for this user."
@@ -195,43 +196,48 @@ msgstr "Une entrée existe déjà pour cet utilisateur avec la même légende."
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:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
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:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
-msgstr ""
+msgstr "Les changements apportés au profile ont étés sauvegardés"
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
-msgstr ""
+msgstr "Les changements des préférences du compte ont étés sauvegardés"
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
msgstr "Mauvais mot de passe"
-#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
#: mediagoblin/user_pages/views.py:215
#, python-format
msgid "You already have a collection called \"%s\"!"
-msgstr ""
+msgstr "Vous avez déjà une collection appelée \"%s\" !"
-#: mediagoblin/edit/views.py:292
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:309
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
-msgstr ""
+msgstr "Vous éditez la collection d'un autre utilisateurs. Faites attention."
#: mediagoblin/gmg_commands/theme.py:58
msgid "Cannot link theme... no theme set\n"
-msgstr ""
+msgstr "Impossible de lier le thème... Aucun thème associé\n"
#: mediagoblin/gmg_commands/theme.py:71
msgid "No asset directory for this theme\n"
-msgstr ""
+msgstr "Aucun répertoire \"asset\" pour ce thème\n"
#: mediagoblin/gmg_commands/theme.py:74
msgid "However, old link directory symlink found; removed.\n"
@@ -240,11 +246,11 @@ msgstr ""
#: mediagoblin/media_types/__init__.py:60
#: mediagoblin/media_types/__init__.py:120
msgid "Sorry, I don't support that file type :("
-msgstr ""
+msgstr "Désolé, mais je ne prends pas en charge cette extension de fichier :("
#: mediagoblin/media_types/video/processing.py:35
msgid "Video transcoding failed"
-msgstr ""
+msgstr "L'encodage de la vidéo à échoué"
#: mediagoblin/plugins/oauth/forms.py:26
msgid "Client ID"
@@ -252,19 +258,19 @@ msgstr ""
#: mediagoblin/plugins/oauth/forms.py:28
msgid "Next URL"
-msgstr ""
+msgstr "Prochaine URL"
#: mediagoblin/plugins/oauth/forms.py:30
msgid "Allow"
-msgstr ""
+msgstr "Autoriser"
#: mediagoblin/plugins/oauth/forms.py:31
msgid "Deny"
-msgstr ""
+msgstr "Refuser"
#: mediagoblin/plugins/oauth/forms.py:35
msgid "Name"
-msgstr ""
+msgstr "Nom"
#: mediagoblin/plugins/oauth/forms.py:36
msgid "The name of the OAuth client"
@@ -272,7 +278,7 @@ msgstr ""
#: mediagoblin/plugins/oauth/forms.py:37
msgid "Description"
-msgstr ""
+msgstr "Description"
#: mediagoblin/plugins/oauth/forms.py:39
msgid ""
@@ -282,7 +288,7 @@ msgstr ""
#: mediagoblin/plugins/oauth/forms.py:41
msgid "Type"
-msgstr ""
+msgstr "Type"
#: mediagoblin/plugins/oauth/forms.py:46
msgid ""
@@ -296,21 +302,21 @@ msgstr ""
#: mediagoblin/plugins/oauth/forms.py:53
msgid "Redirect URI"
-msgstr ""
+msgstr "URL de redirection"
#: mediagoblin/plugins/oauth/forms.py:55
msgid ""
"The redirect URI for the applications, this field\n"
" is required for public clients."
-msgstr ""
+msgstr "L'URI de redirection pour l'application, ce champ est requis pour les clients publics"
#: mediagoblin/plugins/oauth/forms.py:67
msgid "This field is required for public clients"
-msgstr ""
+msgstr "Ce champ est requis pour les clients publics"
#: mediagoblin/plugins/oauth/views.py:59
msgid "The client {0} has been registered!"
-msgstr ""
+msgstr "Le client {0} as été enregistré !"
#: mediagoblin/processing/__init__.py:138
msgid "Invalid file given for media type."
@@ -331,49 +337,30 @@ msgstr "Youhou, c'est envoyé !"
#: 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é"
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr "Zut !"
-
-#: mediagoblin/templates/mediagoblin/404.html:26
-msgid "There doesn't seem to be a page at this address. Sorry!"
-msgstr "Il ne semble pas y avoir de page à cette adresse. Désolé !"
-
-#: 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."
-msgstr "Si vous êtes sûr que l'adresse est correcte, peut-être la page que vous recherchez a été déplacée ou supprimée."
+msgstr "Collection \"%s\" ajoutée !"
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr "Logo MediaGoblin"
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr "Vérifiez votre adresse e-mail !"
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
-msgstr ""
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
+msgstr "Ajouter des médias"
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
-msgstr ""
+msgid "Verify your email!"
+msgstr "Vérifiez votre adresse e-mail !"
#: mediagoblin/templates/mediagoblin/base.html:75
#: mediagoblin/templates/mediagoblin/auth/login.html:28
@@ -386,7 +373,7 @@ msgstr "S'identifier"
msgid ""
"Powered by MediaGoblin, a GNU project."
-msgstr ""
+msgstr "Conçu avec MediaGoblin, un projet GNU."
#: mediagoblin/templates/mediagoblin/base.html:92
#, python-format
@@ -394,55 +381,73 @@ msgid ""
"Released under the AGPL. Source code available."
+msgstr "Disponible sous la licence AGPL. Code source disponible."
+
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr "Changer les paramètres du compte"
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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 "Panneau pour le traitement des médias"
+
+#: mediagoblin/templates/mediagoblin/root.html:51
msgid "Explore"
msgstr "Explorer"
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr "Bonjour, et bienvenu sur ce site MediaGoblin !"
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
msgstr "Ce site fait tourner MediaGoblin, un logiciel d'hébergement de média extraordinairement génial."
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
-msgstr ""
+msgstr "Pour ajouter vos propres médias, commenter, et bien plus encore, vous pouvez vous connecter avec votre compte MediaGoblin"
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
msgstr "Vous n'en avez pas ? C'est facile !"
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
" or\n"
" Set up MediaGoblin on your own server"
-msgstr ""
+msgstr "Créez un compte sur ce site\n ou\n Déployez MediaGoblin sur votre propre serveur"
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
msgstr "Tout derniers media"
-#: 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 "Panneau pour le traitement des médias"
-
#: mediagoblin/templates/mediagoblin/admin/panel.html:29
msgid ""
"Here you can track the state of media being processed on this instance."
-msgstr ""
+msgstr "Ici, vous pouvez suivre l'état des médias en cours de traitement par cette instance."
#: mediagoblin/templates/mediagoblin/admin/panel.html:32
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
@@ -462,25 +467,25 @@ msgstr "Le traitement de ces ajouts a échoué :"
#: mediagoblin/templates/mediagoblin/admin/panel.html:90
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
msgid "No failed entries!"
-msgstr ""
+msgstr "Aucune entrée ayant échoué !"
#: mediagoblin/templates/mediagoblin/admin/panel.html:92
msgid "Last 10 successful uploads"
-msgstr ""
+msgstr "10 derniers envois terminés"
#: mediagoblin/templates/mediagoblin/admin/panel.html:112
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
msgid "No processed entries, yet!"
-msgstr ""
+msgstr "Aucune entrée traitée jusqu'à présent !"
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
-msgstr ""
+msgstr "Enregistrez votre nouveau mot de passe"
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39
msgid "Set password"
-msgstr ""
+msgstr "Enregistrez votre mot de passe"
#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23
#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31
@@ -545,40 +550,53 @@ msgstr "Bonjour %(username)s,\n\npour activer votre compte sur GNU MediaGoblin,
#: mediagoblin/templates/mediagoblin/edit/attachments.html:35
#, python-format
msgid "Editing attachments for %(media_title)s"
-msgstr ""
+msgstr "Ãditer les pièces jointes de %(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 "Modification de %(media_title)s"
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
+msgstr "Pièces jointes"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr "Ajouter une pièce jointe"
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr "Annuler"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
msgid "Save changes"
msgstr "Enregistrer les modifications"
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr "Modification de %(media_title)s"
+
#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
-msgstr ""
+msgstr "Changement des préférences du compte de %(username)s"
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
-msgstr ""
+msgstr "Modification de %(collection_title)s"
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
@@ -596,13 +614,11 @@ msgstr "Médias taggés avec : %(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 "Télécharger"
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr "Original"
@@ -611,56 +627,56 @@ msgid ""
"Sorry, this audio will not work because \n"
"\tyour web browser does not support HTML5 \n"
"\taudio."
-msgstr ""
+msgstr "Désolé, mais ce fichier audio ne se lancera pas car\nvotre navigateur web ne supporte pas l'audio HTML5."
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
msgid ""
"You can get a modern web browser that \n"
"\tcan play the audio at \n"
"\t http://getfirefox.com!"
-msgstr ""
+msgstr "Vous pouvez obtenir un navigateur à jour capable de lire cette vidéo sur \n\t http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
#: mediagoblin/templates/mediagoblin/media_displays/video.html:56
msgid "Original file"
-msgstr ""
+msgstr "Fichier original"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
msgid "WebM file (Vorbis codec)"
-msgstr ""
+msgstr "fichier 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 "Désolé, cette vidéo ne s'affichera pas car\nvotre navigateur ne prends pas en charge le HTML5 pour les vidéos"
#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
msgid ""
"You can get a modern web browser that \n"
"\t can play this video at \n"
"\t http://getfirefox.com!"
-msgstr ""
+msgstr "Vous pouvez obtenir un navigateur à jour capable de lire cette vidéo sur \n\t http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/video.html:59
msgid "WebM file (640p; VP8/Vorbis)"
-msgstr ""
+msgstr "fichier WebM (640p; VP8/Vorbis)"
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
-msgstr ""
+msgstr "Ajouter une collection"
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
-msgstr ""
+msgstr "Ajouter"
#: mediagoblin/templates/mediagoblin/submit/start.html:23
#: mediagoblin/templates/mediagoblin/submit/start.html:30
msgid "Add your media"
-msgstr ""
+msgstr "Ajoutez votre média"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
#, python-format
@@ -670,7 +686,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
#, python-format
msgid "%(collection_title)s by %(username)s"
-msgstr ""
+msgstr "%(collection_title)s de %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
@@ -688,7 +704,7 @@ msgid ""
"\n"
" %(collection_description)s\n"
"
"
-msgstr ""
+msgstr "\n %(collection_description)s\n
"
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -697,25 +713,25 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
-msgstr ""
+msgstr "Supprimer définitivement"
#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
#, python-format
msgid "Really remove %(media_title)s from %(collection_title)s?"
-msgstr ""
+msgstr "Voulez vous vraiment retirer %(media_title)s de %(collection_title)s ?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
-msgstr ""
+msgstr "Retirer"
#: 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 "Bonjour %(username)s,\n%(comment_author)s a commenté votre post (%(comment_url)s) sur %(instance_name)s\n"
#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
#, python-format
@@ -730,28 +746,28 @@ msgstr "Médias de %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
#, python-format
msgid "â Browsing media by %(username)s"
-msgstr ""
+msgstr "â Parcourir les médias de %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/media.html:67
#: mediagoblin/templates/mediagoblin/user_pages/media.html:73
#, python-format
msgid "Image for %(media_title)s"
-msgstr ""
+msgstr "Image de %(media_title)s"
#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
msgid "Add a comment"
-msgstr ""
+msgstr "Ajouter un commentaire"
#: mediagoblin/templates/mediagoblin/user_pages/media.html:109
msgid ""
"You can use Markdown for"
" formatting."
-msgstr ""
+msgstr "Vous pouvez utilisez les Balises pour la mise en page."
#: mediagoblin/templates/mediagoblin/user_pages/media.html:113
msgid "Add this comment"
-msgstr ""
+msgstr "Ajouter ce commentaire"
#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
msgid "at"
@@ -762,29 +778,24 @@ msgstr "Ã "
msgid ""
"Added on
\n"
" %(date)s
"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
-msgid "Attachments"
-msgstr ""
+msgstr "Ajouté le
\n%(date)s
"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
-msgid "Add attachment"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
#, python-format
msgid "Add %(title)s to collection"
-msgstr ""
+msgstr "Ajouter %(title)s à la collection"
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
-msgstr ""
+msgstr "+"
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
-msgstr ""
+msgstr "Ajouter une nouvelle collection"
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
msgid ""
@@ -793,7 +804,7 @@ msgstr "Vous pouvez suivre l'état des médias en cours de traitement pour votre
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
msgid "Your last 10 successful uploads"
-msgstr ""
+msgstr "Vos 10 derniers envois réussis"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:31
#: mediagoblin/templates/mediagoblin/user_pages/user.html:89
@@ -853,47 +864,31 @@ msgstr "Modifier le profil"
msgid "This user hasn't filled in their profile (yet)."
msgstr "Cet utilisateur n'a pas (encore) rempli son profil."
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr "Voir tous les médias de %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
msgstr "C'est là où vos médias apparaîssent, mais vous ne semblez pas avoir encore ajouté quoi que ce soit."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
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 ""
-"
\n"
-" %(note)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
#, python-format
msgid "In collections (%(collected)s)"
-msgstr ""
+msgstr "Dans les collections (%(collected)s)"
#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
msgid "feed icon"
@@ -905,24 +900,24 @@ msgstr "flux Atom"
#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
msgid "Location"
-msgstr ""
+msgstr "Position"
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
-msgstr ""
+msgstr "Regarder sur OpenStreetMap"
#: mediagoblin/templates/mediagoblin/utils/license.html:25
msgid "All rights reserved"
-msgstr ""
+msgstr "Tous droits réservés"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:39
msgid "â Newer"
-msgstr ""
+msgstr "â Le plus récent"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:45
msgid "Older â"
-msgstr ""
+msgstr "Le plus vieux â"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:48
msgid "Go to page:"
@@ -931,19 +926,45 @@ msgstr "Aller à la page :"
#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
msgid "newer"
-msgstr ""
+msgstr "le plus récent"
#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
msgid "older"
-msgstr ""
+msgstr "le plus vieux"
#: mediagoblin/templates/mediagoblin/utils/tags.html:20
msgid "Tagged with"
-msgstr ""
+msgstr "Taggé avec"
#: mediagoblin/tools/exif.py:78
msgid "Could not read the image file."
+msgstr "Impossible de lire l'image."
+
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr "Zut !"
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
msgstr ""
#: mediagoblin/user_pages/forms.py:28
@@ -952,19 +973,19 @@ 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 ""
+msgstr "Je suis certain de vouloir retirer cet élément de la collection"
#: mediagoblin/user_pages/forms.py:35
msgid "-- Select --"
-msgstr ""
+msgstr "-- Sélectionner --"
#: mediagoblin/user_pages/forms.py:37
msgid "Include a note"
-msgstr ""
+msgstr "Inclure une note"
#: mediagoblin/user_pages/lib.py:56
msgid "commented on your post"
-msgstr ""
+msgstr "a commenté votre post"
#: mediagoblin/user_pages/views.py:161
msgid "Oops, your comment was empty."
@@ -976,26 +997,26 @@ msgstr "Votre commentaire a été posté !"
#: mediagoblin/user_pages/views.py:235
msgid "You have to select or add a collection"
-msgstr ""
+msgstr "Vous devez sélectionner ou ajouter une collection"
#: mediagoblin/user_pages/views.py:243
#, python-format
msgid "\"%s\" already in collection \"%s\""
-msgstr ""
+msgstr "\"%s\" est déjà dans la collection \"%s\""
#: mediagoblin/user_pages/views.py:258
#, python-format
msgid "\"%s\" added to collection \"%s\""
-msgstr ""
+msgstr "\"%s\" as été ajouté à la collection \"%s\""
#: mediagoblin/user_pages/views.py:266
msgid "Please check your entries and try again."
-msgstr ""
+msgstr "Veuillez vérifier vos entrées et réessayer."
#: mediagoblin/user_pages/views.py:297
msgid ""
"Some of the files with this entry seem to be missing. Deleting anyway."
-msgstr ""
+msgstr "Certains fichiers correspondant à cette entrée semblent manquant. Suppression tout de même."
#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
@@ -1011,29 +1032,29 @@ msgstr "Vous êtes sur le point de supprimer des médias d'un autre utilisateur.
#: mediagoblin/user_pages/views.py:379
msgid "You deleted the item from the collection."
-msgstr ""
+msgstr "Vous avez supprimé cet élément de la collection."
#: mediagoblin/user_pages/views.py:383
msgid "The item was not removed because you didn't check that you were sure."
-msgstr ""
+msgstr "L'élément n'as pas été supprimé car vous n'avez pas confirmé votre certitude."
#: mediagoblin/user_pages/views.py:393
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
-msgstr ""
+msgstr "Vous vous apprêtez à supprimer un élément de la collection d'un autre utilisateur. Procédez avec attention."
#: mediagoblin/user_pages/views.py:426
#, python-format
msgid "You deleted the collection \"%s\""
-msgstr ""
+msgstr "Vous avez supprimé la collection \"%s\""
#: mediagoblin/user_pages/views.py:433
msgid ""
"The collection was not deleted because you didn't check that you were sure."
-msgstr ""
+msgstr "La collection n'as pas été supprimée car vous n'avez pas confirmé votre certitude"
#: mediagoblin/user_pages/views.py:443
msgid ""
"You are about to delete another user's collection. Proceed with caution."
-msgstr ""
+msgstr "Vous vous apprêtez à supprimer la collection d'un autre utilisateur. Procédez avec attention."
diff --git a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.mo
new file mode 100644
index 00000000..822c3375
Binary files /dev/null and b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo
index b55044f7..11f51e12 100644
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 d16e0022..f8fb3916 100644
--- a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ia/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-09-24 14:01-0500\n"
-"PO-Revision-Date: 2012-09-24 18:57+0000\n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -93,7 +93,7 @@ msgstr ""
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -104,7 +104,7 @@ msgid "Description of this work"
msgstr ""
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
@@ -120,11 +120,11 @@ msgstr "Etiquettas"
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr ""
@@ -163,20 +163,20 @@ msgstr ""
msgid "New password"
msgstr ""
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr ""
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
@@ -190,33 +190,38 @@ msgstr ""
msgid "You are editing another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
msgid "You are editing a user's profile. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
msgstr ""
-#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
#: mediagoblin/user_pages/views.py:215
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:292
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:309
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
@@ -328,46 +333,27 @@ msgstr ""
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/404.html:24
-msgid "Image of 404 goblin stressing out"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/404.html:26
-msgid "There doesn't seem to be a page at this address. Sorry!"
-msgstr ""
-
-#: 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."
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
msgstr ""
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
+msgid "Verify your email!"
msgstr ""
#: mediagoblin/templates/mediagoblin/base.html:75
@@ -391,31 +377,56 @@ msgid ""
"href=\"%(source_link)s\">Source code available."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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 ""
+
+#: mediagoblin/templates/mediagoblin/root.html:51
msgid "Explore"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
@@ -423,17 +434,10 @@ msgid ""
" Set up MediaGoblin on your own server"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
msgstr ""
-#: 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 ""
-
#: mediagoblin/templates/mediagoblin/admin/panel.html:29
msgid ""
"Here you can track the state of media being processed on this instance."
@@ -542,30 +546,43 @@ msgstr ""
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"
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr "Cancellar"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
msgid "Save changes"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
msgstr ""
@@ -591,13 +608,11 @@ msgstr ""
#: 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 ""
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr ""
@@ -648,7 +663,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
msgstr ""
@@ -692,7 +707,7 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr ""
@@ -701,7 +716,7 @@ msgstr ""
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
msgstr ""
@@ -759,13 +774,8 @@ msgid ""
" %(date)s
"
msgstr ""
-#: 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:192
-msgid "Add attachment"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
@@ -773,11 +783,11 @@ msgstr ""
msgid "Add %(title)s to collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
msgstr ""
@@ -848,41 +858,25 @@ msgstr ""
msgid "This user hasn't filled in their profile (yet)."
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
msgid "There doesn't seem to be any media here yet..."
msgstr ""
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
-#, python-format
-msgid ""
-"
\n"
-" %(note)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
@@ -902,7 +896,7 @@ msgstr ""
msgid "Location"
msgstr ""
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
msgstr ""
@@ -941,6 +935,32 @@ msgstr ""
msgid "Could not read the image file."
msgstr ""
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr ""
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:28
msgid "I am sure I want to delete this"
msgstr ""
diff --git a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo
new file mode 100644
index 00000000..1b8a2173
Binary files /dev/null and b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo
index 5658950c..5fca53ad 100644
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 fd04ba6e..75d5191d 100644
--- a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-09-24 14:01-0500\n"
-"PO-Revision-Date: 2012-09-24 18:57+0000\n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -95,7 +95,7 @@ msgstr "Impossibile trovare qualcuno con questo nome utente o password."
msgid "You can now log in using your new password."
msgstr "Ora puoi effettuare l'accesso con la nuova password."
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -106,7 +106,7 @@ msgid "Description of this work"
msgstr "Descrizione di questo lavoro"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
@@ -122,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:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr ""
@@ -165,20 +165,20 @@ msgstr "Inserisci la vecchia password per dimostrare di essere il proprietario d
msgid "New password"
msgstr "Nuova password"
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
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
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
@@ -192,33 +192,38 @@ msgstr ""
msgid "You are editing another user's media. Proceed with caution."
msgstr "Stai modificando files multimediali di un altro utente. Procedi con attenzione."
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
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:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
msgstr "Cambiamenti del profilo salvati"
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
msgstr "Impostazioni del profilo salvate"
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
msgstr "Password errata"
-#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
#: mediagoblin/user_pages/views.py:215
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:292
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:309
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
@@ -330,47 +335,28 @@ msgstr "Evviva! Caricato!"
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/404.html:24
-msgid "Image of 404 goblin stressing out"
-msgstr "Immagine di 404 folletti che stressano"
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr "Oops!"
-
-#: mediagoblin/templates/mediagoblin/404.html:26
-msgid "There doesn't seem to be a page at this address. Sorry!"
-msgstr "Non sembra esserci una pagina a questo indirizzo. Spiacente!"
-
-#: 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."
-msgstr "Se sei sicuro che l'indirizzo è corretto, forse la pagina che stai cercando è stata spostata o cancellata."
-
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr "Simbolo di MediaGoblin"
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr "Verifica la tua email!"
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
-msgstr "+ Aggiungi files multimediali"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
-msgstr "Vedi il tuo profilo"
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
+msgstr "Aggiungi files multimediali"
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
-msgstr "Esci"
+msgid "Verify your email!"
+msgstr "Verifica la tua email!"
#: mediagoblin/templates/mediagoblin/base.html:75
#: mediagoblin/templates/mediagoblin/auth/login.html:28
@@ -393,31 +379,56 @@ msgid ""
"href=\"%(source_link)s\">Source code available."
msgstr "Rilasciato con licenza AGPL. Codice sorgente disponibile."
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr "Cambia le impostazioni dell'account"
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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 files multimediali"
+
+#: mediagoblin/templates/mediagoblin/root.html:51
msgid "Explore"
msgstr "Esplora"
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr "Ciao, benvenuto in questo sito MediaGoblin!"
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
msgstr "Questo sito sta utilizzando Mediagoblin, un ottimo programma per caricare e condividere files multimediali."
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr "Per aggiungere i tuoi file multimediali, scrivere commenti e altro puoi accedere con il tuo account MediaGoblin."
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
msgstr "Non ne hai già uno? E' semplice!"
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
@@ -425,17 +436,10 @@ msgid ""
" Set up MediaGoblin on your own server"
msgstr "Crea un account in questo sito\n oppure\n Installa MediaGoblin sul tuo server"
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
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 files multimediali"
-
#: mediagoblin/templates/mediagoblin/admin/panel.html:29
msgid ""
"Here you can track the state of media being processed on this instance."
@@ -544,30 +548,43 @@ msgstr "Ciao %(username)s,\n\nper attivare il tuo account GNU MediaGoblin, apri
msgid "Editing attachments for %(media_title)s"
msgstr "Stai modificando gli allegati di %(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 "Stai modificando %(media_title)s"
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
+msgstr "Allegati"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr "Aggiungi allegato"
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr "Annulla"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
msgid "Save changes"
msgstr "Salva i cambiamenti"
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr "Stai modificando %(media_title)s"
+
#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
msgstr "Stai cambiando le impostazioni dell'account di %(username)s"
@@ -593,13 +610,11 @@ 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 "Scarica"
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr "Originale"
@@ -650,7 +665,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
msgstr "Aggiungi"
@@ -694,7 +709,7 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "Elimina definitivamente"
@@ -703,7 +718,7 @@ msgstr "Elimina definitivamente"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
msgstr ""
@@ -761,25 +776,20 @@ msgid ""
" %(date)s
"
msgstr "Aggiunto il
\n %(date)s
"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
-msgid "Attachments"
-msgstr "Allegati"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
-msgid "Add attachment"
-msgstr "Aggiungi allegato"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
+msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
#, python-format
msgid "Add %(title)s to collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
msgstr ""
@@ -850,41 +860,25 @@ msgstr "Modifica profilo"
msgid "This user hasn't filled in their profile (yet)."
msgstr "Questo utente non ha (ancora) compilato il proprio profilo."
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr "Cambia le impostazioni dell'account"
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr "Visualizza tutti i files multimediali di %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
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 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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
msgid "There doesn't seem to be any media here yet..."
msgstr "Sembra che non ci sia ancora nessun file multimediale qui..."
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
-#, python-format
-msgid ""
-"
\n"
-" %(note)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
@@ -904,7 +898,7 @@ msgstr "Atom feed"
msgid "Location"
msgstr "Posizione"
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
msgstr "Visualizza su OpenStreetMap"
@@ -943,6 +937,32 @@ msgstr "Taggato con"
msgid "Could not read the image file."
msgstr "Impossibile leggere il file immagine."
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr "Oops!"
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:28
msgid "I am sure I want to delete this"
msgstr "Sono sicuro di volerlo eliminare"
diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo
index fc0bba8f..927d500d 100644
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 5fb16241..5cd1aed6 100644
--- 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-09-24 14:01-0500\n"
-"PO-Revision-Date: 2012-09-24 18:57+0000\n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -92,7 +92,7 @@ msgstr ""
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -103,7 +103,7 @@ msgid "Description of this work"
msgstr ""
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
@@ -119,11 +119,11 @@ msgstr "ã¿ã°"
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "ã¹ã©ã°"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "ã¹ã©ã°ã¯å¿
è¦ã§ãã"
@@ -162,20 +162,20 @@ msgstr ""
msgid "New password"
msgstr ""
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr ""
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
@@ -189,33 +189,38 @@ msgstr "ãã®ã¹ã©ã°ãæã¤ã¨ã³ããªã¯ããã®ã¦ã¼ã¶ã¼ã¯æ¢ã«å
msgid "You are editing another user's media. Proceed with caution."
msgstr "ããªãã¯ãä»ã®ã¦ã¼ã¶ã¼ã®ã¡ãã£ã¢ãç·¨éãã¦ãã¾ããã注æãã ããã"
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
msgid "You are editing a user's profile. Proceed with caution."
msgstr "ããªãã¯ãä»ã®ã¦ã¼ã¶ã¼ã®ãããã¡ã¤ã«ãç·¨éãã¦ãã¾ããã注æãã ããã"
-#: mediagoblin/edit/views.py:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
msgstr ""
-#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
#: mediagoblin/user_pages/views.py:215
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:292
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:309
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
@@ -327,46 +332,27 @@ msgstr "æ稿çµäºï¼"
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/404.html:24
-msgid "Image of 404 goblin stressing out"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/404.html:26
-msgid "There doesn't seem to be a page at this address. Sorry!"
-msgstr ""
-
-#: 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."
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
msgstr ""
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
+msgid "Verify your email!"
msgstr ""
#: mediagoblin/templates/mediagoblin/base.html:75
@@ -390,31 +376,56 @@ msgid ""
"href=\"%(source_link)s\">Source code available."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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 ""
+
+#: mediagoblin/templates/mediagoblin/root.html:51
msgid "Explore"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
@@ -422,17 +433,10 @@ msgid ""
" Set up MediaGoblin on your own server"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
msgstr ""
-#: 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 ""
-
#: mediagoblin/templates/mediagoblin/admin/panel.html:29
msgid ""
"Here you can track the state of media being processed on this instance."
@@ -541,30 +545,43 @@ msgstr "%(username)sæ§ã¸\n\nGNU MediaGoblinã¢ã«ã¦ã³ããæ¤è¨¼ã«ãã
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ãç·¨éä¸"
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr "ãã£ã³ã»ã«"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
msgid "Save changes"
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ãç·¨éä¸"
+
#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
msgstr ""
@@ -590,13 +607,11 @@ msgstr ""
#: 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 ""
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr ""
@@ -647,7 +662,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
msgstr ""
@@ -691,7 +706,7 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr ""
@@ -700,7 +715,7 @@ msgstr ""
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
msgstr ""
@@ -758,13 +773,8 @@ msgid ""
" %(date)s
"
msgstr ""
-#: 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:192
-msgid "Add attachment"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
@@ -772,11 +782,11 @@ msgstr ""
msgid "Add %(title)s to collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
msgstr ""
@@ -847,41 +857,25 @@ msgstr "ãããã£ã¼ã«ãç·¨é"
msgid "This user hasn't filled in their profile (yet)."
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr "%(username)sããã®ã³ã³ãã³ãããã¹ã¦è¦ã"
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
msgid "There doesn't seem to be any media here yet..."
msgstr ""
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
-#, python-format
-msgid ""
-"
\n"
-" %(note)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
@@ -901,7 +895,7 @@ msgstr ""
msgid "Location"
msgstr ""
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
msgstr ""
@@ -940,6 +934,32 @@ msgstr ""
msgid "Could not read the image file."
msgstr ""
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr ""
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:28
msgid "I am sure I want to delete this"
msgstr ""
diff --git a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo
new file mode 100644
index 00000000..94c771ed
Binary files /dev/null and b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo
index c141e456..bab3def6 100644
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 3b0cf98e..e66ead04 100644
--- 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-09-24 14:01-0500\n"
-"PO-Revision-Date: 2012-09-24 18:57+0000\n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -93,7 +93,7 @@ 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/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -104,7 +104,7 @@ msgid "Description of this work"
msgstr "Beschrijving van dit werk"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
@@ -120,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:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Slug"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "De slug kan niet leeg zijn"
@@ -163,20 +163,20 @@ msgstr "Vul je oude wachtwoord in om te bewijzen dat dit jouw account is"
msgid "New password"
msgstr "Nieuw wachtwoord"
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr ""
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
@@ -190,33 +190,38 @@ msgstr "Er bestaat al een met die slug voor deze gebruiker."
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:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
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:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
msgstr "Profielaanpassingen opgeslagen"
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
msgstr "Accountinstellingen opgeslagen"
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
msgstr "Verkeerd wachtwoord"
-#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
#: mediagoblin/user_pages/views.py:215
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:292
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:309
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
@@ -328,47 +333,28 @@ msgstr "Mooizo! Toegevoegd!"
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"
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr "Oeps!"
-
-#: mediagoblin/templates/mediagoblin/404.html:26
-msgid "There doesn't seem to be a page at this address. Sorry!"
-msgstr "Het lijkt erop dat er geen pagina bestaat op dit adres. Sorry!"
-
-#: 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."
-msgstr "Als je zeker weet dat het adres klopt is de pagina misschien verplaatst of verwijderd."
-
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr "MediaGoblin logo"
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr "Verifieer je e-mailadres!"
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
-msgstr "+ Media toevoegen"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
-msgstr "Profiel weergeven"
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
+msgstr "Voeg media toe"
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
-msgstr "Afmelden"
+msgid "Verify your email!"
+msgstr "Verifieer je e-mailadres!"
#: mediagoblin/templates/mediagoblin/base.html:75
#: mediagoblin/templates/mediagoblin/auth/login.html:28
@@ -391,31 +377,56 @@ msgid ""
"href=\"%(source_link)s\">Source code available."
msgstr "Uitgegeven onder de AGPL-licentie. Broncode available."
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr "Accountinstellingen aanpassen"
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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 "Mediaverwerkingspaneel"
+
+#: mediagoblin/templates/mediagoblin/root.html:51
msgid "Explore"
msgstr "Verkennen"
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr "Hoi, welkom op deze MediaGoblin website!"
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
msgstr "Deze website draait MediaGoblin, een buitengewoon goed stuk software voor mediahosting."
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
msgstr "Heb je er nog geen? Het is heel eenvoudig!"
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
@@ -423,17 +434,10 @@ msgid ""
" Set up MediaGoblin on your own server"
msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Creëer een account op deze website</a>\n of\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Gebruik MediaGoblin op je eigen server</a>"
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
msgstr "Nieuwste media"
-#: 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 "Mediaverwerkingspaneel"
-
#: mediagoblin/templates/mediagoblin/admin/panel.html:29
msgid ""
"Here you can track the state of media being processed on this instance."
@@ -542,30 +546,43 @@ msgstr "Hallo %(username)s , open de volgende URL in uw webbrowser om uw GNU Med
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 aanpassen"
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr "Annuleren"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
msgid "Save changes"
msgstr "Wijzigingen opslaan"
+#: 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 aanpassen"
+
#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
msgstr "%(username)ss accountinstellingen aanpassen"
@@ -591,13 +608,11 @@ msgstr "Media met het label: %(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 ""
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr "Origineel"
@@ -648,7 +663,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
msgstr "Voeg toe"
@@ -692,7 +707,7 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "Permanent verwijderen"
@@ -701,7 +716,7 @@ msgstr "Permanent verwijderen"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
msgstr ""
@@ -759,13 +774,8 @@ msgid ""
" %(date)s
"
msgstr "Toegevoegd op
\n %(date)s
"
-#: 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:192
-msgid "Add attachment"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
@@ -773,11 +783,11 @@ msgstr ""
msgid "Add %(title)s to collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
msgstr ""
@@ -848,41 +858,25 @@ msgstr "Profiel aanpassen."
msgid "This user hasn't filled in their profile (yet)."
msgstr "Deze gebruiker heeft zijn of haar profiel (nog) niet ingevuld."
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr "Accountinstellingen aanpassen"
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr "Bekijk alle media van %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
msgstr "Dit is waar je nieuwe media zal verschijnen, maar het lijkt erop dat je nog niets heb toegevoegd."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
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 ""
-"
\n"
-" %(note)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
@@ -902,7 +896,7 @@ msgstr "Atom feed"
msgid "Location"
msgstr "Locatie"
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
msgstr "Bekijken op OpenStreetMap"
@@ -941,6 +935,32 @@ msgstr "Getagged met"
msgid "Could not read the image file."
msgstr "Kon het afbeeldingsbestand niet lezen."
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr "Oeps!"
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:28
msgid "I am sure I want to delete this"
msgstr "Ik weet zeker dat ik dit wil verwijderen."
diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo
index 986475ba..f272497a 100644
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 4156c07b..d1da0b5b 100644
--- a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# , 2011, 2012.
+# , 2011-2012.
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-09-24 14:01-0500\n"
-"PO-Revision-Date: 2012-09-24 18:57+0000\n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/mediagoblin/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -92,7 +92,7 @@ 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/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -100,10 +100,10 @@ msgstr "Tittel"
#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
msgid "Description of this work"
-msgstr "Skildring av mediefila"
+msgstr "Skildring av verk"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
@@ -119,11 +119,11 @@ msgstr "Merkelappar"
msgid "Separate tags by commas."
msgstr "Separer merkelappar med komma."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Nettnamn"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "Nettnamnet kan ikkje vera tomt"
@@ -131,7 +131,7 @@ msgstr "Nettnamnet kan ikkje vera tomt"
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
-msgstr "Nettnamnet (adressetittel) for mediefila di. Trengst ikkje endrast."
+msgstr "Nettnamnet (adressetittel) for verket di. Trengst ikkje endrast."
#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
@@ -162,24 +162,24 @@ msgstr "Skriv inn det gamle passordet ditt for å stadfesta at du eig denne kont
msgid "New password"
msgstr "Nytt passord"
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
-msgstr ""
+msgstr "Send meg epost når andre kjem med innspel på verka mine."
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
-msgstr ""
+msgstr "Tittelen kjan ikkje vera tom"
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
-msgstr ""
+msgstr "Forklaringa til denne samlinga"
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
-msgstr ""
+msgstr "Tittel-delen av denne samlinga si adresse. Du treng normalt sett ikkje endra denne."
#: mediagoblin/edit/views.py:65
msgid "An entry with that slug already exists for this user."
@@ -187,49 +187,54 @@ msgstr "Eit innlegg med denne adressetittelen finst allereie."
#: 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."
+msgstr "Trå varsamt, du endrar nokon andre sine verk."
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Trå varsamt, du endrar nokon andre sin profil."
-#: mediagoblin/edit/views.py:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
msgstr "Lagra endring av profilen"
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
msgstr "Lagra kontoinstellingar"
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
msgstr "Feil passord"
-#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
#: mediagoblin/user_pages/views.py:215
#, python-format
msgid "You already have a collection called \"%s\"!"
-msgstr ""
+msgstr "Du har allereie ei samling med namn «%s»."
-#: mediagoblin/edit/views.py:292
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
-msgstr ""
+msgstr "Ei samling med den nettadressa finst allereie for denne brukaren."
-#: mediagoblin/edit/views.py:309
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
-msgstr ""
+msgstr "Du endrar ein annan brukar si samling. Trå varsamt."
#: mediagoblin/gmg_commands/theme.py:58
msgid "Cannot link theme... no theme set\n"
-msgstr ""
+msgstr "Cannot link theme... no theme set\n"
#: mediagoblin/gmg_commands/theme.py:71
msgid "No asset directory for this theme\n"
-msgstr ""
+msgstr "No asset directory for this theme\n"
#: mediagoblin/gmg_commands/theme.py:74
msgid "However, old link directory symlink found; removed.\n"
-msgstr ""
+msgstr "However, old link directory symlink found; removed.\n"
#: mediagoblin/media_types/__init__.py:60
#: mediagoblin/media_types/__init__.py:120
@@ -238,45 +243,45 @@ msgstr "Orsak, stør ikkje den filtypen :("
#: mediagoblin/media_types/video/processing.py:35
msgid "Video transcoding failed"
-msgstr ""
+msgstr "Skjedde noko gale med video transkodinga"
#: mediagoblin/plugins/oauth/forms.py:26
msgid "Client ID"
-msgstr ""
+msgstr "Klient-ID (client ID)"
#: mediagoblin/plugins/oauth/forms.py:28
msgid "Next URL"
-msgstr ""
+msgstr "Neste adresse (next URL)"
#: mediagoblin/plugins/oauth/forms.py:30
msgid "Allow"
-msgstr ""
+msgstr "Godta"
#: mediagoblin/plugins/oauth/forms.py:31
msgid "Deny"
-msgstr ""
+msgstr "Nekt"
#: mediagoblin/plugins/oauth/forms.py:35
msgid "Name"
-msgstr ""
+msgstr "Namn"
#: mediagoblin/plugins/oauth/forms.py:36
msgid "The name of the OAuth client"
-msgstr ""
+msgstr "Namnet til OAuth-klienten"
#: mediagoblin/plugins/oauth/forms.py:37
msgid "Description"
-msgstr ""
+msgstr "Forklaring"
#: mediagoblin/plugins/oauth/forms.py:39
msgid ""
"This will be visible to users allowing your\n"
" application to authenticate as them."
-msgstr ""
+msgstr "Dette vil vera synleg for brukarar som godtek applikasjonen din til å autentisera dei."
#: mediagoblin/plugins/oauth/forms.py:41
msgid "Type"
-msgstr ""
+msgstr "Type"
#: mediagoblin/plugins/oauth/forms.py:46
msgid ""
@@ -286,29 +291,29 @@ msgid ""
" Public - The client can't make confidential\n"
" requests to the GNU MediaGoblin instance (e.g. client-side\n"
" JavaScript client)."
-msgstr ""
+msgstr "Confidential - Konfidensielt, på engelsk: 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).
\nPublic - Open, på engelsk: The client can't make confidential\n requests to the GNU MediaGoblin instance (e.g. client-side\n JavaScript client)."
#: mediagoblin/plugins/oauth/forms.py:53
msgid "Redirect URI"
-msgstr ""
+msgstr "Omdirigering URI"
#: mediagoblin/plugins/oauth/forms.py:55
msgid ""
"The redirect URI for the applications, this field\n"
" is required for public clients."
-msgstr ""
+msgstr "Omdirigerings-URI-en for programmene. Denne feltet krevst for opne (public) klientar."
#: mediagoblin/plugins/oauth/forms.py:67
msgid "This field is required for public clients"
-msgstr ""
+msgstr "Dette feltet krevst for opne (public) klientar"
#: mediagoblin/plugins/oauth/views.py:59
msgid "The client {0} has been registered!"
-msgstr ""
+msgstr "Klienten {0} er registrert."
#: mediagoblin/processing/__init__.py:138
msgid "Invalid file given for media type."
-msgstr "Ugyldig fil for mediatypen."
+msgstr "Ugyldig fil for medietypen."
#: mediagoblin/submit/forms.py:26
msgid "File"
@@ -325,49 +330,30 @@ msgstr "Johoo! Opplasta!"
#: 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."
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr "Oops."
-
-#: mediagoblin/templates/mediagoblin/404.html:26
-msgid "There doesn't seem to be a page at this address. Sorry!"
-msgstr "Det ser ikkje ut til å vera noko her... Orsak."
-
-#: 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."
-msgstr "Er du sikker på at adressa er korrekt, so er sida truleg flytta eller sletta."
+msgstr "La til samlinga «%s»."
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr "MediaGoblin"
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr "Verifiser epostadressa di."
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
-msgstr "+ Legg til medie"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
-msgstr "Sjå profilen din"
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
+msgstr "Legg til verk"
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
-msgstr "Logg ut"
+msgid "Verify your email!"
+msgstr "Verifiser epostadressa di."
#: mediagoblin/templates/mediagoblin/base.html:75
#: mediagoblin/templates/mediagoblin/auth/login.html:28
@@ -390,31 +376,56 @@ msgid ""
"href=\"%(source_link)s\">Source code available."
msgstr "Lisensiert med AGPL. Kjeldekode er tilgjengeleg."
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr "Endra kontoinstellingar"
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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 "Verkprosesseringspanel"
+
+#: mediagoblin/templates/mediagoblin/root.html:51
msgid "Explore"
msgstr "Utforsk"
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr "Heihei, velkomen til denne MediaGoblin-sida."
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
-msgstr "Denne sida køyrer MediaGoblin, eit superbra program for å visa fram mediefiler."
+msgstr "Denne sida køyrer MediaGoblin, eit superbra program for å visa fram dine kreative verk."
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
-msgstr ""
+msgstr "Vil du leggja til eigne verk og innpel, so må du logga inn."
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
msgstr "Har du ikkje ein enno? Det er enkelt!"
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
@@ -422,50 +433,43 @@ msgid ""
" Set up MediaGoblin on your own server"
msgstr "Opprett ein konto på denne sida eller set opp MediaGoblin på eigen tenar"
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
-msgstr "Nyaste mediefiler"
-
-#: 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 "Mediehandsamingspanel"
+msgstr "Nyaste verk"
#: mediagoblin/templates/mediagoblin/admin/panel.html:29
msgid ""
"Here you can track the state of media being processed on this instance."
-msgstr ""
+msgstr "Hald oppsyn med statusen for prosessering av verka dine her."
#: mediagoblin/templates/mediagoblin/admin/panel.html:32
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
msgid "Media in-processing"
-msgstr "Media under handsaming"
+msgstr "Verk under prosessesering"
#: mediagoblin/templates/mediagoblin/admin/panel.html:58
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
msgid "No media in-processing"
-msgstr "Ingen media under handsaming"
+msgstr "Ingen verk vert prosessert"
#: mediagoblin/templates/mediagoblin/admin/panel.html:61
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59
msgid "These uploads failed to process:"
-msgstr "Klarte ikkje handsama desse opplasta filene:"
+msgstr "Klarte ikkje prosessera desse opplasta filene:"
#: mediagoblin/templates/mediagoblin/admin/panel.html:90
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
msgid "No failed entries!"
-msgstr ""
+msgstr "Ingen feila filer."
#: mediagoblin/templates/mediagoblin/admin/panel.html:92
msgid "Last 10 successful uploads"
-msgstr ""
+msgstr "Dei siste ti opplastningane"
#: mediagoblin/templates/mediagoblin/admin/panel.html:112
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
msgid "No processed entries, yet!"
-msgstr ""
+msgstr "Ingenting prossesert, enno."
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
@@ -539,32 +543,45 @@ msgstr "Hei %(username)s,\n\nopna fylgjande netadresse i netlesaren din for å a
#: mediagoblin/templates/mediagoblin/edit/attachments.html:35
#, python-format
msgid "Editing attachments for %(media_title)s"
-msgstr ""
+msgstr "Endrar vedlegg 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 "Endrar %(media_title)s"
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
+msgstr "Vedlegg"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr "Legg ved vedlegg"
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr "Bryt av"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
msgid "Save changes"
msgstr "Lagra"
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr "Endrar %(media_title)s"
+
#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
msgstr "Endrar kontoinnstellingane til %(username)s"
@@ -572,7 +589,7 @@ msgstr "Endrar kontoinnstellingane til %(username)s"
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
-msgstr ""
+msgstr "Endrar %(collection_title)s"
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
@@ -586,17 +603,15 @@ msgstr "Endrar profilen til %(username)s"
#: mediagoblin/templates/mediagoblin/listings/tag.html:35
#, python-format
msgid "Media tagged with: %(tag_name)s"
-msgstr "Media merka med: %(tag_name)s"
+msgstr "Verk merka med: %(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 "Last ned"
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr "Opphavleg"
@@ -617,7 +632,7 @@ msgstr "Du kan skaffa ein moderne netlesar som kan spela av dette lydklippet hj
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
#: mediagoblin/templates/mediagoblin/media_displays/video.html:56
msgid "Original file"
-msgstr ""
+msgstr "Opphavleg fil"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
msgid "WebM file (Vorbis codec)"
@@ -639,32 +654,32 @@ msgstr "Du kan skaffa ein moderne netlesar som kan spela av denne videoen hjå <
#: mediagoblin/templates/mediagoblin/media_displays/video.html:59
msgid "WebM file (640p; VP8/Vorbis)"
-msgstr ""
+msgstr "WebM fil (640p; VP8/Vorbis)"
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
-msgstr ""
+msgstr "Legg til ei samling"
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
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"
+msgstr "Legg til verk"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
#, python-format
msgid "%(collection_title)s (%(username)s's collection)"
-msgstr ""
+msgstr "%(collection_title)s (%(username)s si samling)"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
#, python-format
msgid "%(collection_title)s by %(username)s"
-msgstr ""
+msgstr "%(collection_title)s av %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
@@ -682,7 +697,7 @@ msgid ""
"\n"
" %(collection_description)s\n"
"
"
-msgstr ""
+msgstr "\n %(collection_description)s\n
"
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -691,40 +706,40 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
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 ""
+msgstr "Fjerna %(media_title)s frå %(collection_title)s?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
-msgstr ""
+msgstr "Fjern"
#: 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 "Hei %(username)s,\n%(comment_author)s kommenterte innlegget ditt (%(comment_url)s) hjå %(instance_name)s\n"
#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
#, python-format
msgid "%(username)s's media"
-msgstr "Filene til %(username)s"
+msgstr "Verka til %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37
#, python-format
msgid "%(username)s's media"
-msgstr "%(username)s sine mediefiler"
+msgstr "%(username)s sine verk"
#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
#, python-format
msgid "â Browsing media by %(username)s"
-msgstr "â Browsing media by %(username)s"
+msgstr "â Ser pÃ¥ %(username)s sine verk"
#: mediagoblin/templates/mediagoblin/user_pages/media.html:67
#: mediagoblin/templates/mediagoblin/user_pages/media.html:73
@@ -758,36 +773,31 @@ msgid ""
" %(date)s
"
msgstr "Lagt til
\n %(date)s
"
-#: 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:192
-msgid "Add attachment"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
#, python-format
msgid "Add %(title)s to collection"
-msgstr ""
+msgstr "Putt %(title)s inn i samling"
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
-msgstr ""
+msgstr "+"
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
-msgstr ""
+msgstr "Legg til ei ny samling"
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
msgid ""
"You can track the state of media being processed for your gallery here."
-msgstr "Sjå status for mediehandsaming av biletene dine her."
+msgstr "Sjå status for prosessering av verka dine her."
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
msgid "Your last 10 successful uploads"
-msgstr ""
+msgstr "Dine ti siste opplastningar."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:31
#: mediagoblin/templates/mediagoblin/user_pages/user.html:89
@@ -847,47 +857,31 @@ msgstr "Endra profil"
msgid "This user hasn't filled in their profile (yet)."
msgstr "Brukaren har ikkje fylt ut profilen sin (enno)."
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr "Endra kontoinstellingar"
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
-msgstr "Sjå alle %(username)s sine mediefiler"
+msgstr "Sjå alle %(username)s sine verk"
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
-msgstr "Her kjem mediefilene dine."
+msgstr "Her kjem verka dine."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
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 ""
-"
\n"
-" %(note)s"
-msgstr ""
+msgstr "Ser ikkje ut til at det finst nokon verk her nett no."
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
#, python-format
msgid "In collections (%(collected)s)"
-msgstr ""
+msgstr "I samlingar (%(collected)s)"
#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
msgid "feed icon"
@@ -901,7 +895,7 @@ msgstr "Atom-kjelde"
msgid "Location"
msgstr "Stad"
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
msgstr "Sjå på OpenStreetMap"
@@ -940,25 +934,51 @@ msgstr "Merka med"
msgid "Could not read the image file."
msgstr "Klarte ikkje lesa biletefila."
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr "Oops."
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
#: 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 ""
+msgstr "Eg er sikker på at eg vil fjerna dette frå samlinga"
#: mediagoblin/user_pages/forms.py:35
msgid "-- Select --"
-msgstr ""
+msgstr "-- Vel --"
#: mediagoblin/user_pages/forms.py:37
msgid "Include a note"
-msgstr ""
+msgstr "Legg ved eit notat"
#: mediagoblin/user_pages/lib.py:56
msgid "commented on your post"
-msgstr ""
+msgstr "kom med innspel på innlegget ditt"
#: mediagoblin/user_pages/views.py:161
msgid "Oops, your comment was empty."
@@ -970,64 +990,64 @@ msgstr "Innspelet ditt er lagt til."
#: mediagoblin/user_pages/views.py:235
msgid "You have to select or add a collection"
-msgstr ""
+msgstr "Du må velja eller laga ei samling"
#: mediagoblin/user_pages/views.py:243
#, python-format
msgid "\"%s\" already in collection \"%s\""
-msgstr ""
+msgstr "«%s» er allereie i samling «%s»"
#: mediagoblin/user_pages/views.py:258
#, python-format
msgid "\"%s\" added to collection \"%s\""
-msgstr ""
+msgstr "«%s» lagt til samling «%s»"
#: mediagoblin/user_pages/views.py:266
msgid "Please check your entries and try again."
-msgstr ""
+msgstr "Sjekk filene dine og prøv omatt."
#: mediagoblin/user_pages/views.py:297
msgid ""
"Some of the files with this entry seem to be missing. Deleting anyway."
-msgstr ""
+msgstr "Nokre av filene ser ut til å mangla. Slettar likevel."
#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
-msgstr "Du sletta fila."
+msgstr "Du sletta verket."
#: 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."
+msgstr "Sletta ikkje verket."
#: 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."
+msgstr "Du er i ferd med å sletta ein annan brukar sine verk. Trå varsamt."
#: mediagoblin/user_pages/views.py:379
msgid "You deleted the item from the collection."
-msgstr ""
+msgstr "Du fjerna fila frå samlinga."
#: mediagoblin/user_pages/views.py:383
msgid "The item was not removed because you didn't check that you were sure."
-msgstr ""
+msgstr "Fila var ikkje fjerna fordi du ikkje var sikker."
#: mediagoblin/user_pages/views.py:393
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
-msgstr ""
+msgstr "Du er i ferd med å fjerna ei fil frå ein annan brukar si samling. Trå varsamt."
#: mediagoblin/user_pages/views.py:426
#, python-format
msgid "You deleted the collection \"%s\""
-msgstr ""
+msgstr "Samlinga «%s» sletta"
#: mediagoblin/user_pages/views.py:433
msgid ""
"The collection was not deleted because you didn't check that you were sure."
-msgstr ""
+msgstr "Sletta ikkje samlinga."
#: mediagoblin/user_pages/views.py:443
msgid ""
"You are about to delete another user's collection. Proceed with caution."
-msgstr ""
+msgstr "Du er i ferd med å sletta ein annan brukar si samling. Trå varsamt."
diff --git a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.mo
index 77dcfe12..82273769 100644
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 7dea3837..828f3d8a 100644
--- 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-09-24 14:01-0500\n"
-"PO-Revision-Date: 2012-09-24 18:57+0000\n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -92,7 +92,7 @@ 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/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -103,7 +103,7 @@ msgid "Description of this work"
msgstr "Opis tej pracy"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
@@ -119,11 +119,11 @@ msgstr "Znaczniki"
msgid "Separate tags by commas."
msgstr "Rozdzielaj znaczniki przecinkami."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Slug"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "Slug nie może byÄ pusty"
@@ -162,20 +162,20 @@ msgstr "Wprowadź swoje stare hasÅo aby udowodniÄ, że to twoje konto."
msgid "New password"
msgstr "Nowe hasÅo"
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr "Powiadamiaj mnie e-mailem o komentarzach do moich mediów"
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr "TytuÅ nie może byÄ pusty"
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
msgstr "Opis tej kolekcji"
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
@@ -189,33 +189,38 @@ msgstr "Adres z tym slugiem dla tego użytkownika już istnieje."
msgid "You are editing another user's media. Proceed with caution."
msgstr "Edytujesz media innego użytkownika. Zachowaj ostrożnoÅÄ."
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Edytujesz profil innego użytkownika. Zachowaj ostrożnoÅÄ."
-#: mediagoblin/edit/views.py:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
msgstr "Zapisano zmiany profilu"
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
msgstr "Zapisano ustawienia konta"
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
msgstr "NieprawidÅowe hasÅo"
-#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
#: mediagoblin/user_pages/views.py:215
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Kolekcja \"%s\" już istnieje!"
-#: mediagoblin/edit/views.py:292
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
msgstr "Kolekcja tego użytkownika z takim slugiem już istnieje."
-#: mediagoblin/edit/views.py:309
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
msgstr "Edytujesz kolekcjÄ innego użytkownika. Zachowaj ostrożnoÅÄ."
@@ -327,47 +332,28 @@ msgstr "Hura! WysÅano!"
msgid "Collection \"%s\" added!"
msgstr "Kolekcja \"%s\" zostaÅa dodana!"
-#: mediagoblin/templates/mediagoblin/404.html:24
-msgid "Image of 404 goblin stressing out"
-msgstr "Grafika zestresowanego goblina 404."
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr "Ups!"
-
-#: mediagoblin/templates/mediagoblin/404.html:26
-msgid "There doesn't seem to be a page at this address. Sorry!"
-msgstr "Niestety, nie ma strony o takim adresie!"
-
-#: 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."
-msgstr "JeÅli twoim zdaniem ten adres jest prawidÅowy, to może poszukiwana strona zostaÅa przeniesiona lub usuniÄta."
-
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr "Logo MediaGoblin"
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr "Zweryfikuj swój adres e-mail!"
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
-msgstr "+ Dodaj media"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
-msgstr "+ Dodaj kolekcjÄ"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
-msgstr "Zobacz swój profil"
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
+msgstr "Dodaj media"
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
-msgstr "Wyloguj siÄ"
+msgid "Verify your email!"
+msgstr "Zweryfikuj swój adres e-mail!"
#: mediagoblin/templates/mediagoblin/base.html:75
#: mediagoblin/templates/mediagoblin/auth/login.html:28
@@ -390,31 +376,56 @@ msgid ""
"href=\"%(source_link)s\">Source code available."
msgstr "Opublikowane na licencji AGPL. DostÄpny jest kod źródÅowy."
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr "ZmieÅ ustawienia konta"
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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 przetwarzania mediów"
+
+#: mediagoblin/templates/mediagoblin/root.html:51
msgid "Explore"
msgstr "Odkrywaj"
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr "CzeÅÄ, witaj na stronie MediaGoblin!"
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
msgstr "Ten serwis dziaÅa w oparciu o MediaGoblin, Åwietne oprogramowanie do publikowania mediów."
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr "Aby dodawaÄ swoje pliki, komentowaÄ i wykonywaÄ inne czynnoÅci, możesz siÄ zalogowaÄ na swoje konto MediaGoblin."
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
msgstr "Jeszcze go nie masz? To proste!"
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
@@ -422,17 +433,10 @@ msgid ""
" Set up MediaGoblin on your own server"
msgstr "Utwórz konto w tym serwisie\n lub\n zaÅóż wÅasny serwis MediaGoblin"
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
msgstr "Najnowsze media"
-#: 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 przetwarzania mediów"
-
#: mediagoblin/templates/mediagoblin/admin/panel.html:29
msgid ""
"Here you can track the state of media being processed on this instance."
@@ -541,30 +545,43 @@ msgstr "CzeÅÄ %(username)s,\n\naby aktywowaÄ twoje konto GNU MediaGoblin, otw
msgid "Editing attachments for %(media_title)s"
msgstr "Edycja zaÅÄ
czników do %(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 "Edytowanie %(media_title)s"
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
+msgstr "ZaÅÄ
czniki"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr "Dodaj zaÅÄ
cznik"
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr "Anuluj"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
msgid "Save changes"
msgstr "Zapisz zmiany"
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr "Edytowanie %(media_title)s"
+
#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
msgstr "Zmiana ustawieÅ konta %(username)s"
@@ -590,13 +607,11 @@ msgstr "Media ze znacznikami: %(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 "Pobierz"
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr "OryginaÅ"
@@ -647,7 +662,7 @@ msgstr "Dodaj kolekcjÄ"
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
msgstr "Dodaj"
@@ -691,7 +706,7 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "UsuÅ na staÅe"
@@ -700,7 +715,7 @@ msgstr "UsuÅ na staÅe"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr "Na pewno usunÄ
Ä %(media_title)s z %(collection_title)s?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
msgstr "UsuÅ"
@@ -758,25 +773,20 @@ msgid ""
" %(date)s
"
msgstr "Dodane
\n %(date)s
"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
-msgid "Attachments"
-msgstr "ZaÅÄ
czniki"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
-msgid "Add attachment"
-msgstr "Dodaj zaÅÄ
cznik"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
+msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
#, python-format
msgid "Add %(title)s to collection"
msgstr "Dodaj %(title)s do kolekcji"
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
msgstr "+"
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
msgstr "Dodaj nowÄ
kolekcjÄ"
@@ -847,42 +857,26 @@ msgstr "Edytuj profil"
msgid "This user hasn't filled in their profile (yet)."
msgstr "Ten użytkownik nie wypeÅniÅ (jeszcze) opisu swojego profilu."
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr "ZmieÅ ustawienia konta"
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr "Zobacz wszystkie media użytkownika %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
msgstr "Tu bÄdÄ
widoczne twoje media, ale na razie niczego tu jeszcze nie ma."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
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 ""
-"
\n"
-" %(note)s"
-msgstr "
\n %(note)s"
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
-msgstr "
(usuÅ)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
+msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
#, python-format
@@ -901,7 +895,7 @@ msgstr "KanaÅ Atom"
msgid "Location"
msgstr "PoÅożenie"
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
msgstr "Zobacz na OpenStreetMap"
@@ -940,6 +934,32 @@ msgstr "Znaczniki:"
msgid "Could not read the image file."
msgstr "Nie udaÅo siÄ odczytaÄ pliku grafiki."
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr "Ups!"
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:28
msgid "I am sure I want to delete this"
msgstr "Na pewno chcÄ to usunÄ
Ä"
diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo
index 1552ce78..4b917fb8 100644
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 ff431932..944fe54b 100644
--- 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-09-24 14:01-0500\n"
-"PO-Revision-Date: 2012-09-24 18:57+0000\n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/mediagoblin/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -93,7 +93,7 @@ msgstr ""
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -104,7 +104,7 @@ msgid "Description of this work"
msgstr "Descrição desse trabalho"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
@@ -120,11 +120,11 @@ msgstr "Etiquetas"
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Arquivo"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "O arquivo não pode estar vazio"
@@ -163,20 +163,20 @@ msgstr ""
msgid "New password"
msgstr ""
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr ""
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
@@ -190,33 +190,38 @@ msgstr "Uma entrada com esse arquivo já existe para esse usuário"
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:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
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:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
msgstr "Senha errada"
-#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
#: mediagoblin/user_pages/views.py:215
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:292
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:309
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
@@ -328,47 +333,28 @@ msgstr "Eba! Enviado!"
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/404.html:24
-msgid "Image of 404 goblin stressing out"
-msgstr "Imagem do goblin 404 aparecendo"
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr "Oops"
-
-#: mediagoblin/templates/mediagoblin/404.html:26
-msgid "There doesn't seem to be a page at this address. Sorry!"
-msgstr "Aparentemente não existe uma página com esse endereço. Desculpe!"
-
-#: 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."
-msgstr "Se você está certo de que o endereço está correto, talvez a página que esteja procurando tenha sido apagada ou mudou de endereço"
-
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr "Logo MediaGoblin"
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr "Verifique seu email!"
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
-msgstr ""
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
+msgstr "Adicionar mÃdia"
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
-msgstr ""
+msgid "Verify your email!"
+msgstr "Verifique seu email!"
#: mediagoblin/templates/mediagoblin/base.html:75
#: mediagoblin/templates/mediagoblin/auth/login.html:28
@@ -391,31 +377,56 @@ msgid ""
"href=\"%(source_link)s\">Source code available."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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 "Painel de processamento de mÃdia"
+
+#: mediagoblin/templates/mediagoblin/root.html:51
msgid "Explore"
msgstr "Explorar"
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr "Olá, bemvindo ao site de MediaGoblin."
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
msgstr " "
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
@@ -423,17 +434,10 @@ msgid ""
" Set up MediaGoblin on your own server"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
msgstr "MÃdia mais recente"
-#: 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 "Painel de processamento de mÃdia"
-
#: mediagoblin/templates/mediagoblin/admin/panel.html:29
msgid ""
"Here you can track the state of media being processed on this instance."
@@ -542,30 +546,43 @@ msgstr "Olá %(username)s,\n\nPara ativar sua conta GNU MediaGoblin, visite este
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 "Editando %(media_title)s"
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr "Cancelar"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
msgid "Save changes"
msgstr "Salvar mudanças"
+#: 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_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
msgstr ""
@@ -591,13 +608,11 @@ msgstr ""
#: 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 ""
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr "Original"
@@ -648,7 +663,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
msgstr ""
@@ -692,7 +707,7 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr ""
@@ -701,7 +716,7 @@ msgstr ""
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
msgstr ""
@@ -759,13 +774,8 @@ msgid ""
" %(date)s
"
msgstr ""
-#: 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:192
-msgid "Add attachment"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
@@ -773,11 +783,11 @@ msgstr ""
msgid "Add %(title)s to collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
msgstr ""
@@ -848,41 +858,25 @@ msgstr "Editar perfil"
msgid "This user hasn't filled in their profile (yet)."
msgstr "Esse usuário não preencheu seu perfil (ainda)."
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr "Ver todas as mÃdias de %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
msgstr "Aqui é onde sua mÃdia vai aparecer, mas parece que você não adicionou nada ainda."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
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 ""
-"
\n"
-" %(note)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
@@ -902,7 +896,7 @@ msgstr "Atom feed"
msgid "Location"
msgstr ""
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
msgstr ""
@@ -941,6 +935,32 @@ msgstr ""
msgid "Could not read the image file."
msgstr ""
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr "Oops"
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:28
msgid "I am sure I want to delete this"
msgstr "Eu tenho certeza de que quero pagar isso"
diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo
index 8a759873..b2749ff9 100644
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 e391869b..fabd9c31 100644
--- a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ro/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-09-24 14:01-0500\n"
-"PO-Revision-Date: 2012-09-24 18:57+0000\n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/mediagoblin/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -93,7 +93,7 @@ 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/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -104,7 +104,7 @@ msgid "Description of this work"
msgstr "Descrierea acestui fiÈier"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
@@ -120,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:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Identificator"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "Identificatorul nu poate sÄ lipseascÄ"
@@ -163,20 +163,20 @@ msgstr "Introdu vechea parolÄ pentru a demonstra cÄ eÈti titularul acestui co
msgid "New password"
msgstr "Noua parolÄ"
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
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/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr "Titlul nu poate sÄ fie gol"
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
msgstr "Descriere pentru aceastÄ colecÈie"
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
@@ -190,33 +190,38 @@ msgstr "ExistÄ deja un entry cu acelaÈi identificator pentru acest utilizator.
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:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Editezi profilul unui utilizator. Se recomandÄ prudenÈÄ."
-#: mediagoblin/edit/views.py:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
msgstr "ModificÄrile profilului au fost salvate"
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
msgstr "SetÄrile pentru acest cont au fost salvate"
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
msgstr "ParolÄ incorectÄ"
-#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
#: mediagoblin/user_pages/views.py:215
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Ai deja o colecÈie numitÄ \"%s\"!"
-#: mediagoblin/edit/views.py:292
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
msgstr "O colecÈie cu acelaÈi slug existÄ deja pentru acest utilizator."
-#: mediagoblin/edit/views.py:309
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
msgstr "Lucrezi pe colecÈia unui alt utilizator. Se recomandÄ prudenÈÄ."
@@ -328,47 +333,28 @@ msgstr "Ura! Trimis!"
msgid "Collection \"%s\" added!"
msgstr "ColecÈia \"%s\" a fost creatÄ!"
-#: mediagoblin/templates/mediagoblin/404.html:24
-msgid "Image of 404 goblin stressing out"
-msgstr "Imagine cu elful 404 stresat."
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr "Hopa!"
-
-#: 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:28
-msgid ""
-"If you're sure the address is correct, maybe the page you're looking for has"
-" been moved or deleted."
-msgstr "DacÄ eÈti sigur cÄ adresa e corectÄ, poate cÄ pagina pe care o cauÈi a fost mutatÄ sau ÈtearsÄ."
-
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr "logo MediaGoblin"
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr "VerificÄ adresa de e-mail!"
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
-msgstr "+ AdaugÄ fiÈier media"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
-msgstr "+ CreeazÄ colecÈie"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
-msgstr "Vezi profilul tÄu"
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
+msgstr "Trimite fiÈier"
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
-msgstr "IeÈire"
+msgid "Verify your email!"
+msgstr "VerificÄ adresa de e-mail!"
#: mediagoblin/templates/mediagoblin/base.html:75
#: mediagoblin/templates/mediagoblin/auth/login.html:28
@@ -391,31 +377,56 @@ msgid ""
"href=\"%(source_link)s\">Source code available."
msgstr "Publicat sub licenÈa AGPL. Codul sursÄ este disponibil."
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr "ModificÄ setÄrile contului"
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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/root.html:51
msgid "Explore"
msgstr "ExploreazÄ"
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr "Salut, bine ai venit pe acest site MediaGoblin!"
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
msgstr "Acest site foloseÈte MediaGoblin, un software excepÈional pentru gÄzduirea fiÈierelor media."
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr "Pentru a adÄuga fiÈierele tale Èi pentru a comenta te poÈi autentifica cu contul tÄu MediaGoblin."
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
msgstr "ÃncÄ nu ai unul? E simplu!"
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
@@ -423,17 +434,10 @@ msgid ""
" Set up MediaGoblin on your own server"
msgstr "CreeazÄ un cont pe acest site\n sau\n InstaleazÄ MediaGoblin pe serverul tÄu"
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
msgstr "Cele mai recente fiÈiere"
-#: 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:29
msgid ""
"Here you can track the state of media being processed on this instance."
@@ -542,30 +546,43 @@ msgstr "BunÄ, %(username)s,\n\npentru activarea contului tÄu la GNU MediaGobli
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/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
+msgstr "Anexe"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr "AtaÈeazÄ"
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr "Anulare"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: 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.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_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
msgstr "Se modificÄ setÄrile contului pentru userul %(username)s"
@@ -591,13 +608,11 @@ msgstr "FiÈier etichetat cu tag-urile: %(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 "Download"
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr "Original"
@@ -648,7 +663,7 @@ msgstr "CreeazÄ o colecÈie"
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
msgstr "AdaugÄ"
@@ -692,7 +707,7 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "Èterge definitiv"
@@ -701,7 +716,7 @@ msgstr "Èterge definitiv"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr "Sigur doreÈti sÄ Ètergi %(media_title)s din %(collection_title)s?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
msgstr "Èterge"
@@ -759,25 +774,20 @@ msgid ""
" %(date)s
"
msgstr "AdÄugat la
\n %(date)s
"
-#: 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:192
-msgid "Add attachment"
-msgstr "AtaÈeazÄ"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
+msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
#, python-format
msgid "Add %(title)s to collection"
msgstr "AdaugÄ %(title)s la colecÈie"
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
msgstr "+"
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
msgstr "CreeazÄ o nouÄ colecÈie"
@@ -848,42 +858,26 @@ msgstr "Editare profil"
msgid "This user hasn't filled in their profile (yet)."
msgstr "Acest utilizator nu Èi-a completat (încÄ) profilul."
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr "ModificÄ setÄrile contului"
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr "Vezi toate fiÈierele media ale lui %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
msgstr "Aici vor apÄrea fiÈierele tale media, dar se pare cÄ Ã®ncÄ nu ai trimis nimic."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
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 ""
-"
\n"
-" %(note)s"
-msgstr "
\n %(note)s"
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
-msgstr "
(Èterge)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
+msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
#, python-format
@@ -902,7 +896,7 @@ msgstr "feed Atom"
msgid "Location"
msgstr "Locul"
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
msgstr "Vezi pe OpenStreetMap"
@@ -941,6 +935,32 @@ msgstr "Etichete"
msgid "Could not read the image file."
msgstr "FiÈierul cu imaginea nu a putut fi citit."
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr "Hopa!"
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:28
msgid "I am sure I want to delete this"
msgstr "Sunt sigur cÄ doresc sÄ Èterg"
diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo
index d8967294..d13c1445 100644
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 8785e8ac..fc5e1037 100644
--- a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-09-24 11:41-0500\n"
-"PO-Revision-Date: 2012-09-24 18:15+0000\n"
-"Last-Translator: aleksejrs \n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
+"Last-Translator: cwebber \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -92,7 +92,7 @@ msgstr "Ðе найдено никого Ñ Ñаким именем полÑзо
msgid "You can now log in using your new password."
msgstr "ТепеÑÑ Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе войÑи, иÑполÑзÑÑ Ð²Ð°Ñ Ð½Ð¾Ð²Ñй паÑолÑ."
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -103,7 +103,7 @@ msgid "Description of this work"
msgstr "ÐпиÑание ÑÑого пÑоизведениÑ"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
@@ -119,11 +119,11 @@ msgstr "ÐеÑки"
msgid "Separate tags by commas."
msgstr "(ÑеÑез запÑÑÑÑ)"
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "ÐÑлиÑиÑелÑÐ½Ð°Ñ ÑаÑÑÑ Ð°Ð´ÑеÑа"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "ÐÑлиÑиÑелÑÐ½Ð°Ñ ÑаÑÑÑ Ð°Ð´ÑеÑа необÑ
одима"
@@ -162,20 +162,20 @@ msgstr "ÐведиÑе Ñвой ÑÑаÑÑй паÑÐ¾Ð»Ñ Ð² каÑеÑÑве д
msgid "New password"
msgstr "ÐовÑй паÑолÑ"
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr "УведомлÑÑÑ Ð¼ÐµÐ½Ñ Ð¿Ð¾ e-mail о комменÑаÑиÑÑ
к моим Ñайлам"
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
msgstr "ÐпиÑание ÑÑой коллекÑии"
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
@@ -189,32 +189,38 @@ msgstr "У ÑÑого полÑзоваÑÐµÐ»Ñ Ñже еÑÑÑ Ñайл Ñ Ñа
msgid "You are editing another user's media. Proceed with caution."
msgstr "ÐÑ ÑедакÑиÑÑеÑе ÑÐ°Ð¹Ð»Ñ Ð´ÑÑгого полÑзоваÑелÑ. ÐÑдÑÑе оÑÑоÑожнÑ."
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
msgid "You are editing a user's profile. Proceed with caution."
msgstr "ÐÑ ÑедакÑиÑÑеÑе пÑоÑÐ¸Ð»Ñ Ð¿Ð¾Ð»ÑзоваÑелÑ. ÐÑдÑÑе оÑÑоÑожнÑ."
-#: mediagoblin/edit/views.py:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
msgstr "ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿ÑоÑÐ¸Ð»Ñ ÑоÑ
ÑаненÑ"
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
msgstr "ÐаÑÑÑойки ÑÑÑÑной запиÑи запиÑанÑ"
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
msgstr "ÐепÑавилÑнÑй паÑолÑ"
-#: mediagoblin/edit/views.py:287
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
+#: mediagoblin/user_pages/views.py:215
#, python-format
-msgid "You already have a collection called \"%s\"!title"
-msgstr "У Ð²Ð°Ñ Ñже еÑÑÑ ÐºÐ¾Ð»Ð»ÐµÐºÑÐ¸Ñ Â«%s»!title"
+msgid "You already have a collection called \"%s\"!"
+msgstr "У Ð²Ð°Ñ Ñже еÑÑÑ ÐºÐ¾Ð»Ð»ÐµÐºÑÐ¸Ñ Ñ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸ÐµÐ¼ «%s»!"
-#: mediagoblin/edit/views.py:290
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
msgstr "У ÑÑого полÑзоваÑÐµÐ»Ñ Ñже еÑÑÑ ÐºÐ¾Ð»Ð»ÐµÐºÑÐ¸Ñ Ñ Ñакой оÑлиÑиÑелÑной ÑаÑÑÑÑ Ð°Ð´ÑеÑа."
-#: mediagoblin/edit/views.py:307
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
msgstr "ÐÑ ÑедакÑиÑÑеÑе коллекÑÐ¸Ñ Ð´ÑÑгого полÑзоваÑелÑ. ÐÑдÑÑе оÑÑоÑожнÑ."
@@ -321,57 +327,33 @@ msgstr "ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð·Ð°Ð³ÑÑзиÑÑ Ñайл."
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 "У Ð²Ð°Ñ Ñже еÑÑÑ ÐºÐ¾Ð»Ð»ÐµÐºÑÐ¸Ñ Ñ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸ÐµÐ¼ «%s»!"
-
#: mediagoblin/submit/views.py:215
#, python-format
msgid "Collection \"%s\" added!"
msgstr "ÐоллекÑÐ¸Ñ Â«%s» добавлена!"
-#: mediagoblin/templates/mediagoblin/404.html:24
-msgid "Image of 404 goblin stressing out"
-msgstr "ÐзобÑажение 404 неÑвниÑаÑÑего гоблина"
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr "Ðй!"
-
-#: mediagoblin/templates/mediagoblin/404.html:26
-msgid "There doesn't seem to be a page at this address. Sorry!"
-msgstr "ÐажеÑÑÑ, Ñакой ÑÑÑаниÑÑ Ð½Ðµ ÑÑÑеÑÑвÑеÑ. Уж извиниÑе!"
-
-#: 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."
-msgstr "Ðозможно, ÑÑÑаниÑа, коÑоÑÑÑ Ð²Ñ Ð¸ÑеÑе, бÑла Ñдалена или пеÑееÑ
ала."
-
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr "Символ MediaGoblin"
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr "ÐодÑвеÑдиÑе Ð²Ð°Ñ Ð°Ð´ÑÐµÑ ÑлекÑÑонной поÑÑÑ!"
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
-msgstr "+ ÐобавиÑÑ Ñайл"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
-msgstr "+ ÐобавиÑÑ ÐºÐ¾Ð»Ð»ÐµÐºÑиÑ"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
-msgstr "ÐоÑмоÑÑеÑÑ Ñвой пÑоÑилÑ"
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
+msgstr "ÐобавиÑÑ ÑайлÑ"
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
-msgstr "ÐавеÑÑение ÑеанÑа"
+msgid "Verify your email!"
+msgstr "ÐодÑвеÑдиÑе Ð²Ð°Ñ Ð°Ð´ÑÐµÑ ÑлекÑÑонной поÑÑÑ!"
#: mediagoblin/templates/mediagoblin/base.html:75
#: mediagoblin/templates/mediagoblin/auth/login.html:28
@@ -394,31 +376,56 @@ msgid ""
"href=\"%(source_link)s\">Source code available."
msgstr "Ðн опÑбликован на ÑÑловиÑÑ
AGPL. ÐоÑÑÑÐ¿Ð½Ñ Ð¸ÑÑ
однÑе ÑекÑÑÑ."
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr "ÐзмениÑÑ Ð½Ð°ÑÑÑойки ÑÑÑÑной запиÑи"
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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 "ÐÐ°Ð½ÐµÐ»Ñ Ð¾Ð±ÑабоÑки Ñайлов"
+
+#: mediagoblin/templates/mediagoblin/root.html:51
msgid "Explore"
msgstr "СмоÑÑеÑÑ"
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr "ÐÑивеÑ! ÐобÑо пожаловаÑÑ Ð½Ð° Ð½Ð°Ñ MediaGoblinâовÑй ÑайÑ!"
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
msgstr "ÐÑÐ¾Ñ ÑÐ°Ð¹Ñ ÑабоÑÐ°ÐµÑ Ð½Ð° MediaGoblin, необÑкновенно замеÑаÑелÑном ÐÐ Ð´Ð»Ñ Ñ
оÑÑинга мÑлÑÑимедийнÑÑ
Ñайлов."
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr "ÐÐ»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ ÑобÑÑвеннÑÑ
Ñайлов, комменÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¸ Ñ. п. Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе пÑедÑÑавиÑÑÑÑ Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ Ð²Ð°Ñей MediaGoblinâовой ÑÑÑÑной запиÑи."
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
msgstr "У Ð²Ð°Ñ ÐµÑ ÐµÑÑ Ð½ÐµÑ? Ðе пÑоблема!"
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
@@ -426,17 +433,10 @@ msgid ""
" Set up MediaGoblin on your own server"
msgstr "СоздайÑе ÑÑÑÑнÑÑ Ð·Ð°Ð¿Ð¸ÑÑ Ð½Ð° ÑÑом ÑайÑе\n или\n ÑÑÑановиÑе MediaGoblin на ÑобÑÑвеннÑй ÑеÑвеÑ"
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
msgstr "СамÑе новÑе ÑайлÑ"
-#: 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 "ÐÐ°Ð½ÐµÐ»Ñ Ð¾Ð±ÑабоÑки Ñайлов"
-
#: mediagoblin/templates/mediagoblin/admin/panel.html:29
msgid ""
"Here you can track the state of media being processed on this instance."
@@ -545,30 +545,43 @@ msgstr "ÐÑивеÑ, %(username)s!\n\nЧÑÐ¾Ð±Ñ Ð°ÐºÑивиÑоваÑÑ Ñв
msgid "Editing attachments for %(media_title)s"
msgstr "Ðобавление ÑопÑÑÑÑвÑÑÑего Ñайла Ð´Ð»Ñ %(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 "РедакÑиÑование %(media_title)s"
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
+msgstr "СопÑÑÑÑвÑÑÑие ÑайлÑ"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr "ÐобавиÑÑ ÑопÑÑÑÑвÑÑÑий Ñайл"
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr "ÐÑмена"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
msgid "Save changes"
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"
+
#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
msgstr "ÐаÑÑÑойка ÑÑÑÑной запиÑи %(username)s"
@@ -594,13 +607,11 @@ msgstr "Ð¤Ð°Ð¹Ð»Ñ Ñ Ð¼ÐµÑкой: %(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 "СкаÑаÑÑ"
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr "ÐÑигинал"
@@ -651,7 +662,7 @@ msgstr "Ðобавление коллекÑии"
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
msgstr "ÐобавиÑÑ"
@@ -695,7 +706,7 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "УдалиÑÑ Ð±ÐµÐ·Ð²Ð¾Ð·Ð²ÑаÑно"
@@ -704,7 +715,7 @@ msgstr "УдалиÑÑ Ð±ÐµÐ·Ð²Ð¾Ð·Ð²ÑаÑно"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr "Ð Ñамом деле иÑклÑÑиÑÑ %(media_title)s из %(collection_title)s?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
msgstr "ÐÑклÑÑиÑÑ"
@@ -762,25 +773,20 @@ msgid ""
" %(date)s
"
msgstr "Ðобавлено
\n %(date)s
"
-#: 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:192
-msgid "Add attachment"
-msgstr "ÐобавиÑÑ ÑопÑÑÑÑвÑÑÑий Ñайл"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
+msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
#, python-format
msgid "Add %(title)s to collection"
msgstr "ÐобавиÑÑ %(title)s в коллекÑиÑ"
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
msgstr "Ðобавление новой коллекÑии"
@@ -851,41 +857,25 @@ msgstr "РедакÑиÑоваÑÑ Ð¿ÑоÑилÑ"
msgid "This user hasn't filled in their profile (yet)."
msgstr "ÐÑÐ¾Ñ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ Ð½Ðµ заполнил Ñвой пÑоÑайл (пока)."
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr "ÐзмениÑÑ Ð½Ð°ÑÑÑойки ÑÑÑÑной запиÑи"
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr "СмоÑÑеÑÑ Ð²Ñе ÑÐ°Ð¹Ð»Ñ %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
msgstr "ÐаÑи ÑÐ°Ð¹Ð»Ñ Ð¿Ð¾ÑвÑÑÑÑ Ð·Ð´ÐµÑÑ, когда Ð²Ñ Ð¸Ñ
добавиÑе."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
msgid "There doesn't seem to be any media here yet..."
msgstr "Ðока ÑÑо ÑÑÑ Ñайлов неÑâ¦"
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
-#, python-format
-msgid ""
-"
\n"
-" %(note)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
@@ -905,7 +895,7 @@ msgstr "ленÑа в ÑоÑмаÑе Atom"
msgid "Location"
msgstr "Ðа каÑÑе"
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
msgstr "ÐоÑмоÑÑеÑÑ Ð½Ð° OpenStreetMap"
@@ -944,6 +934,32 @@ msgstr "ÐеÑки"
msgid "Could not read the image file."
msgstr "Ðе ÑдалоÑÑ Ð¿ÑоÑиÑаÑÑ Ñайл Ñ Ð¸Ð·Ð¾Ð±Ñажением."
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr "Ðй!"
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:28
msgid "I am sure I want to delete this"
msgstr "Я ÑвеÑен, ÑÑо Ñ
оÑÑ ÑдалиÑÑ ÑÑо"
diff --git a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo
index 48a3873f..a374f08c 100644
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 4d59ccd5..c3a43705 100644
--- a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po
@@ -4,13 +4,16 @@
#
# Translators:
# Martin Zatroch , 2012.
+# Morten Juhl-Johansen Zölde-Fejér , 2012.
+# Olle Jonsson , 2012.
+# Tanja Trudslev , 2012.
# , 2011-2012.
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-09-24 14:01-0500\n"
-"PO-Revision-Date: 2012-09-24 18:57+0000\n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -22,109 +25,109 @@ msgstr ""
#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
msgid "Username"
-msgstr "Prihlasovacie meno"
+msgstr "Brugernavn"
#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
msgid "Password"
-msgstr "Heslo"
+msgstr "Kodeord"
#: mediagoblin/auth/forms.py:34
msgid "Email address"
-msgstr "E-mailová adresa"
+msgstr "Email adresse"
#: mediagoblin/auth/forms.py:51
msgid "Username or email"
-msgstr "PoužÃvateľské meno alebo e-mailová adresa"
+msgstr "Brugernavn eller email"
#: mediagoblin/auth/forms.py:58
msgid "Incorrect input"
-msgstr "Nesprávny vstup"
+msgstr "Forkert input"
#: mediagoblin/auth/views.py:55
msgid "Sorry, registration is disabled on this instance."
-msgstr "PrepáÄ, registrácia na tejto inÅ¡tancii nie je povolená."
+msgstr "Desværre, registrering er ikke muligt på denne instans"
#: mediagoblin/auth/views.py:75
msgid "Sorry, a user with that name already exists."
-msgstr "PrepáÄ, rovnaké prihlasovacie meno už niekto použÃva."
+msgstr "Desværre, det brugernavn er allerede brugt"
#: mediagoblin/auth/views.py:79
msgid "Sorry, a user with that email address already exists."
-msgstr "PrepáÄ, použÃvateľ s rovnakou e-mailovou adresou už existuje."
+msgstr "Desværre, en bruger er allerede oprettet for den email"
#: mediagoblin/auth/views.py:182
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
-msgstr "Tvoja e-mailová adresa bola úspeÅ¡ne overená. MôžeÅ¡ sa hneÄ prihlásiÅ¥, upraviÅ¥ svoj profil a vkladaÅ¥ výtvory! "
+msgstr "Din email adresse er blevet bekræftet. Du kan nu logge på, ændre din profil, og indsende billeder!"
#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
-msgstr "Nesprávny overovacà kÄ¾ÃºÄ alebo použÃvateľský identifikátor"
+msgstr "Bekræftelsesnøglen eller brugerid er forkert"
#: mediagoblin/auth/views.py:206
msgid "You must be logged in so we know who to send the email to!"
-msgstr "Aby sme ti mohli zaslať e-mailovú správu, je potrebné byť prihláseným!"
+msgstr "Du er nødt til at være logget ind, så vi ved hvem vi skal emaile!"
#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
-msgstr "Tvoja e-mailová adresa už bola raz overená!"
+msgstr "Du har allerede bekræftet din email adresse!"
#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
-msgstr "Opätovne zaslať overovaciu správu na e-mail."
+msgstr "Email til godkendelse sendt igen."
#: mediagoblin/auth/views.py:263
msgid ""
"An email has been sent with instructions on how to change your password."
-msgstr "E-mailová správa s inštrukciami pre zmenu tvojho hesla bola odoslaná."
+msgstr "En email er blevet sendt med instruktioner til at ændre dit kodeord."
#: mediagoblin/auth/views.py:273
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
-msgstr "Nebolo ti možné zaslaÅ¥ e-mailovú správu ohľadom obnovy hesla, nakoľko je tvoje použÃvateľské meno buÄ neaktÃvne alebo e-mailová adresa úÄtu neoverená."
+msgstr "Vi kunne ikke sende en kodeords nulstillings email da dit brugernavn er inaktivt, eller din konto's email adresse er ikke blevet godkendt."
#: mediagoblin/auth/views.py:285
msgid "Couldn't find someone with that username or email."
-msgstr "Nebolo možné nájsÅ¥ nikoho s týmto použÃvateľským menom alebo e-mailovou adresou."
+msgstr "Vi kunne ikke dit brugernavn eller email."
#: mediagoblin/auth/views.py:333
msgid "You can now log in using your new password."
-msgstr "Teraz sa môžeš prihlásiť so svojim novým heslom."
+msgstr "Du kan nu logge ind med dit nye kodeord."
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
-msgstr "Nadpis"
+msgstr "Titel"
#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
msgid "Description of this work"
-msgstr "Charakteristika tohto diela"
+msgstr "Beskrivelse af arbejdet"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
-msgstr "MôžeÅ¡ využiÅ¥\n \n Markdown pri formátovanÃ."
+msgstr "Du kan bruge\n \n Markdown til formattering."
#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
msgid "Tags"
-msgstr "ZnaÄky"
+msgstr "Tags"
#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
-msgstr "Oddeľ jednotlivé Å¡tÃtky Äiarkami."
+msgstr "Separer tags med kommaer."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Unikátna ÄasÅ¥ adresy"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "Unikátna ÄasÅ¥ adresy nesmie byÅ¥ prázdna"
@@ -132,12 +135,12 @@ msgstr "Unikátna ÄasÅ¥ adresy nesmie byÅ¥ prázdna"
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
-msgstr "Titulná ÄasÅ¥ adresy tohto výtvoru. VäÄÅ¡inou nie je potrebná zmena."
+msgstr "Titeldelen af dette medie's adresse. Du behøver normalt ikke ændre dette."
#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
-msgstr "Licencia"
+msgstr "Licens"
#: mediagoblin/edit/forms.py:50
msgid "Bio"
@@ -145,42 +148,42 @@ msgstr "Bio"
#: mediagoblin/edit/forms.py:56
msgid "Website"
-msgstr "Webstránka"
+msgstr "Websted"
#: mediagoblin/edit/forms.py:58
msgid "This address contains errors"
-msgstr "Adresa obsahuje chyby"
+msgstr "Denne adresse indeholder fejl"
#: mediagoblin/edit/forms.py:63
msgid "Old password"
-msgstr "Staré heslo"
+msgstr "Gammelt kodeord"
#: mediagoblin/edit/forms.py:64
msgid "Enter your old password to prove you own this account."
-msgstr "PotvrÄ, že vlastnÃÅ¡ tento úÄet zadanÃm svojho starého hesla."
+msgstr "Skriv dit gamle kodeord for at bevise det er din konto."
#: mediagoblin/edit/forms.py:67
msgid "New password"
-msgstr "Nové heslo"
+msgstr "Ny kodeord"
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
-msgstr "ZaslaÅ¥ mi e-mail, keÄ ostatnà pridajú komentár k médiu"
+msgstr "Email mig når andre kommenterer på mine medier"
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
-msgstr ""
+msgstr "Titlen kan ikke være tom"
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
-msgstr ""
+msgstr "Beskrivelse af denne samling"
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
-msgstr ""
+msgstr "Titeldelen af denne samlings's adresse. Du behøver normalt ikke ændre dette."
#: mediagoblin/edit/views.py:65
msgid "An entry with that slug already exists for this user."
@@ -188,41 +191,46 @@ msgstr "Položku s rovnakou unikátnou ÄasÅ¥ou adresy už niekde máš."
#: 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."
+msgstr "Du er ved at ændre en anden brugers' medier. Pas på."
+
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:181
msgid "You are editing a user's profile. Proceed with caution."
-msgstr "UpravujeÅ¡ použÃvateľský profil. Dbaj na to."
+msgstr "Du er ved at ændre en bruger's profil. Pas på."
-#: mediagoblin/edit/views.py:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
-msgstr "Ãpravy profilu uložené"
+msgstr "Profilændringer gemt"
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
-msgstr "Nastavenia úÄtu uložené"
+msgstr "Kontoindstillinger gemt"
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
-msgstr "Nesprávne heslo"
+msgstr "Forkert kodeord"
-#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
#: mediagoblin/user_pages/views.py:215
#, python-format
msgid "You already have a collection called \"%s\"!"
-msgstr ""
+msgstr "Du har allerede en samling ved navn \"%s\"!"
-#: mediagoblin/edit/views.py:292
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
-msgstr ""
+msgstr "Kolekcia s týmto Å¡tÃtkom sa už u teba vyskytuje."
-#: mediagoblin/edit/views.py:309
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
-msgstr ""
+msgstr "Du er ved at ændre en anden bruger's samling. Pas på."
#: mediagoblin/gmg_commands/theme.py:58
msgid "Cannot link theme... no theme set\n"
-msgstr "Nemôžem priradiť tému.. žiadny set témy\n"
+msgstr "Kan ikke linke til tema... intet tema sat\n"
#: mediagoblin/gmg_commands/theme.py:71
msgid "No asset directory for this theme\n"
@@ -235,7 +243,7 @@ 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
msgid "Sorry, I don't support that file type :("
-msgstr "PrepáÄ, nepodporujem tento súborový typ =("
+msgstr "Desværre, jeg understøtter ikke den filtype :("
#: mediagoblin/media_types/video/processing.py:35
msgid "Video transcoding failed"
@@ -243,41 +251,41 @@ msgstr "Konvertovanie videa zlyhalo"
#: mediagoblin/plugins/oauth/forms.py:26
msgid "Client ID"
-msgstr ""
+msgstr "Klientské ID"
#: mediagoblin/plugins/oauth/forms.py:28
msgid "Next URL"
-msgstr ""
+msgstr "Næste URL"
#: mediagoblin/plugins/oauth/forms.py:30
msgid "Allow"
-msgstr ""
+msgstr "Tillad"
#: mediagoblin/plugins/oauth/forms.py:31
msgid "Deny"
-msgstr ""
+msgstr "Forbyd"
#: mediagoblin/plugins/oauth/forms.py:35
msgid "Name"
-msgstr ""
+msgstr "Navn"
#: mediagoblin/plugins/oauth/forms.py:36
msgid "The name of the OAuth client"
-msgstr ""
+msgstr "Navnet af OAuth klienten"
#: mediagoblin/plugins/oauth/forms.py:37
msgid "Description"
-msgstr ""
+msgstr "Beskrivelse"
#: mediagoblin/plugins/oauth/forms.py:39
msgid ""
"This will be visible to users allowing your\n"
" application to authenticate as them."
-msgstr ""
+msgstr "Toto bude viditeľné pre použÃvateľov,\n ktorà sa identifikujú sami cez tvoju aplikáciu."
#: mediagoblin/plugins/oauth/forms.py:41
msgid "Type"
-msgstr ""
+msgstr "Type"
#: mediagoblin/plugins/oauth/forms.py:46
msgid ""
@@ -287,95 +295,76 @@ msgid ""
" Public - The client can't make confidential\n"
" requests to the GNU MediaGoblin instance (e.g. client-side\n"
" JavaScript client)."
-msgstr ""
+msgstr "Dôverné - Klient môže\nvytváraÅ¥ požiadavky na inÅ¡tanciu GNU MediaGoblin, ktoré nemôžu byÅ¥\nzachytené použÃvateľským agentom (napr. klient na strane servera).
\nVerejné - Klient nemôže vytváraÅ¥ dôverné\npožiadavky voÄi GNU MediaGoblin inÅ¡tancii (napr. JavaScript-ový klient\n na klientskej strane)."
#: mediagoblin/plugins/oauth/forms.py:53
msgid "Redirect URI"
-msgstr ""
+msgstr "Presmerovacie URI"
#: mediagoblin/plugins/oauth/forms.py:55
msgid ""
"The redirect URI for the applications, this field\n"
" is required for public clients."
-msgstr ""
+msgstr "Presmerovacie URI pre aplikácie, toto pole\nj požadované pre verejných klientov."
#: mediagoblin/plugins/oauth/forms.py:67
msgid "This field is required for public clients"
-msgstr ""
+msgstr "Dette felt er nødvendigt for offentlige klienter"
#: mediagoblin/plugins/oauth/views.py:59
msgid "The client {0} has been registered!"
-msgstr ""
+msgstr "Klienten {0} er blevet registreret!"
#: mediagoblin/processing/__init__.py:138
msgid "Invalid file given for media type."
-msgstr "Odovzdaný nesprávny súbor pre daný typ média."
+msgstr "Forkert fil for medietypen."
#: mediagoblin/submit/forms.py:26
msgid "File"
-msgstr "Súbor"
+msgstr "Fil"
#: mediagoblin/submit/views.py:57
msgid "You must provide a file."
-msgstr "MusÃÅ¡ poskytnúť súbor."
+msgstr "Du må give mig en fil"
#: mediagoblin/submit/views.py:164
msgid "Woohoo! Submitted!"
-msgstr "Juchú! ÃspeÅ¡ne vložené!"
+msgstr "Juhuu! Delt!"
#: 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"
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr "Ajaj!"
-
-#: mediagoblin/templates/mediagoblin/404.html:26
-msgid "There doesn't seem to be a page at this address. Sorry!"
-msgstr "Na danej adrese sa stránka zrejme nenachádza. PrepáÄ!"
-
-#: 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."
-msgstr "Ak vieš s istotou, že adresa je správna, tak najskôr bola hľadaná stánka presunutá alebo zmazaná."
+msgstr "Kolekcia \"%s\" pridaná!"
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr "MediaGoblin logo"
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr "Over si e-mailovú adresu!"
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
-msgstr "+ Pridať výtvor"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
-msgstr "Zobraziť svoj profil"
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
+msgstr "Pridať výtvor"
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
-msgstr "Odhlásiť sa"
+msgid "Verify your email!"
+msgstr "Bekræft din email!"
#: 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"
+msgstr "Log ind"
#: mediagoblin/templates/mediagoblin/base.html:89
msgid ""
@@ -391,31 +380,56 @@ msgid ""
"href=\"%(source_link)s\">Source code available."
msgstr "Vydané pod AGPL. Zdrojový kód dostupný."
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr "ZmeniÅ¥ nastavenia úÄtu"
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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 "Sekcia spracovania výtvorov"
+
+#: mediagoblin/templates/mediagoblin/root.html:51
msgid "Explore"
-msgstr "Preskúmať"
+msgstr "Udforsk"
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "Ahoj, vitaj na tejto MediaGoblin stránke!"
+msgstr "Hey, velkommen til denne MediaGoblin side!"
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
msgstr "Táto stránka použÃva MediaGoblin, výnimoÄne skvelý kus softvéru na hostovanie médiÃ."
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
-msgstr "Pre umiestnenie vlastných médiÃ, pridanie komentárov a viac, sa môžeÅ¡ prihlásiÅ¥ so svojim MediaGoblin úÄtom."
+msgstr "For at tilføje dine egne medier, skrive kommentarer, og mere, du kan logge ind med din MediaGoblin konto."
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
-msgstr "Ešte žiaden nemáš? Je to jednoduché!"
+msgstr "Har du ikke en endnu? Det er let!"
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
@@ -423,17 +437,10 @@ msgid ""
" Set up MediaGoblin on your own server"
msgstr "VytvoriÅ¥ úÄet na tejto stránke\n alebo\n ZaložiÅ¥ MediaGoblin na vlastnom serveri"
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
msgstr "NajÄerstvejÅ¡ie výtvory"
-#: 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 "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."
@@ -506,11 +513,11 @@ msgstr "Prihlásenie zlyhalo!"
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
-msgstr "EÅ¡te nemáš úÄet?"
+msgstr "Har du endnu ikke en konto?"
#: mediagoblin/templates/mediagoblin/auth/login.html:45
msgid "Create one here!"
-msgstr "Vytvor si jeden tu!"
+msgstr "Opret en her!"
#: mediagoblin/templates/mediagoblin/auth/login.html:51
msgid "Forgot your password?"
@@ -519,7 +526,7 @@ msgstr "Zabudnuté heslo?"
#: mediagoblin/templates/mediagoblin/auth/register.html:28
#: mediagoblin/templates/mediagoblin/auth/register.html:36
msgid "Create an account!"
-msgstr "VytvoriÅ¥ úÄet!"
+msgstr "Opret en konto!"
#: mediagoblin/templates/mediagoblin/auth/register.html:40
msgid "Create"
@@ -542,30 +549,43 @@ msgstr "Ahoj %(username)s,\n\npre aktiváciu tvojho GNU MediaGoblin úÄtu, otvo
msgid "Editing attachments for %(media_title)s"
msgstr "Ãprava prÃloh pre %(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 "Ãprava %(media_title)s"
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
+msgstr "PrÃlohy"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr "PridaÅ¥ prÃlohu"
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
-msgstr "Zrušiť"
+msgstr "Afbryd"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
msgid "Save changes"
-msgstr "Uložiť zmeny"
+msgstr "Gem ændringer"
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr "Ãprava %(media_title)s"
#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
msgstr "MenÃm nastavenia úÄtu použÃvateľa %(username)s"
@@ -573,13 +593,13 @@ 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 ""
+msgstr "Ãprava %(collection_title)s"
#: 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"
+msgstr "Redigerer %(username)s profil"
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
@@ -591,13 +611,11 @@ msgstr "Výtvory oznaÄené ako: %(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 "Stiahnuť"
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr "Originál"
@@ -644,11 +662,11 @@ msgstr "WebM súbor (640p; VP8/Vorbis)"
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
-msgstr ""
+msgstr "Pridať kolekciu"
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
msgstr "Pridať"
@@ -660,12 +678,12 @@ msgstr "Pridaj svoj výtvor"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
#, python-format
msgid "%(collection_title)s (%(username)s's collection)"
-msgstr ""
+msgstr "%(collection_title)s (kolekcia použÃvateľa %(username)s) "
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
#, python-format
msgid "%(collection_title)s by %(username)s"
-msgstr ""
+msgstr "%(collection_title)s od %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
@@ -683,7 +701,7 @@ msgid ""
"\n"
" %(collection_description)s\n"
"
"
-msgstr ""
+msgstr "\n%(collection_description)s
"
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -692,18 +710,18 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
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 ""
+msgstr "UrÄite odstrániÅ¥ %(media_title)s z %(collection_title)s?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
-msgstr ""
+msgstr "Odstrániť"
#: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
#, python-format
@@ -759,27 +777,22 @@ msgid ""
" %(date)s
"
msgstr "Pridané
\n %(date)s
"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
-msgid "Attachments"
-msgstr "PrÃlohy"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
-msgid "Add attachment"
-msgstr "PridaÅ¥ prÃlohu"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
+msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
#, python-format
msgid "Add %(title)s to collection"
-msgstr ""
+msgstr "Pridať %(title)s do kolekcie"
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
-msgstr ""
+msgstr "+"
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
-msgstr ""
+msgstr "Pridať novú kolekciu"
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
msgid ""
@@ -798,7 +811,7 @@ msgstr "Profil, ktorý vlastnà %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:43
msgid "Sorry, no such user found."
-msgstr "PrepáÄ, zadané použÃvateľské meno nenájdené."
+msgstr "Desværre, fandt ikke den bruger."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:50
#: mediagoblin/templates/mediagoblin/user_pages/user.html:70
@@ -807,20 +820,20 @@ msgstr "Potrebné overenie e-mailovej adresy"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:53
msgid "Almost done! Your account still needs to be activated."
-msgstr "Takmer hotovo! EÅ¡te ti musà byÅ¥ aktivovaný úÄet."
+msgstr "Næsten færdig! Din konto skal stadig aktiveres."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:58
msgid ""
"An email should arrive in a few moments with instructions on how to do so."
-msgstr "E-mailová správa s popisom ako to spraviť, by mal zanedlho doraziť."
+msgstr "Der skulle komme email om et par øjeblikke med instrukser om hvordan."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:62
msgid "In case it doesn't:"
-msgstr "V prÃpade, že sa tak nestalo:"
+msgstr "Hvis det ikke gør:"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:65
msgid "Resend verification email"
-msgstr "Opätovne zaslať overovaciu správu na e-mail"
+msgstr "Gensend verificeringsemail"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:73
msgid ""
@@ -837,58 +850,42 @@ msgstr "Pokiaľ si to ty, ale už nemáš overovaciu e-mailovú správu, tak sa
#: mediagoblin/templates/mediagoblin/user_pages/user.html:96
msgid "Here's a spot to tell others about yourself."
-msgstr "Miesto, kde smieÅ¡ povedaÅ¥ Äo to o sebe ostatným."
+msgstr "Her kan du fortælle andre om dig selv."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:101
#: mediagoblin/templates/mediagoblin/user_pages/user.html:118
msgid "Edit profile"
-msgstr "Upraviť profil"
+msgstr "Ret profil"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:106
msgid "This user hasn't filled in their profile (yet)."
msgstr "DotyÄný použÃvateľ eÅ¡te nevyplnil svoj profil (zatiaľ)."
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr "ZmeniÅ¥ nastavenia úÄtu"
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr "Zhliadnuť všetky výtvory, ktoré vlastnà %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
msgstr "VÅ¡etky tvoje výtvory sa objavia práve tu, ale zatiaľ nemáš niÄ pridané."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
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 ""
-"
\n"
-" %(note)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
#, python-format
msgid "In collections (%(collected)s)"
-msgstr ""
+msgstr "V kolekciách (%(collected)s)"
#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
msgid "feed icon"
@@ -902,7 +899,7 @@ msgstr "ÄÃtaÄka Atom"
msgid "Location"
msgstr "Poloha"
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
msgstr "Zobraziť na OpenStreetMap"
@@ -941,21 +938,47 @@ msgstr "OznaÄené ako"
msgid "Could not read the image file."
msgstr "Nebolo možné preÄÃtaÅ¥ obrazový súbor."
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr "Hovsa!"
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
#: 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 ""
+msgstr "Rozhodne chcem odstrániť danú položku z kolekcie"
#: mediagoblin/user_pages/forms.py:35
msgid "-- Select --"
-msgstr ""
+msgstr "-- Vybrať --"
#: mediagoblin/user_pages/forms.py:37
msgid "Include a note"
-msgstr ""
+msgstr "Pridať poznámku"
#: mediagoblin/user_pages/lib.py:56
msgid "commented on your post"
@@ -971,21 +994,21 @@ msgstr "Tvoj komentár bol zaslaný!"
#: mediagoblin/user_pages/views.py:235
msgid "You have to select or add a collection"
-msgstr ""
+msgstr "MusÃÅ¡ vybraÅ¥ alebo pridaÅ¥ kolekciu"
#: mediagoblin/user_pages/views.py:243
#, python-format
msgid "\"%s\" already in collection \"%s\""
-msgstr ""
+msgstr "\"%s\" sa už nachádza v kolekcie \"%s\""
#: mediagoblin/user_pages/views.py:258
#, python-format
msgid "\"%s\" added to collection \"%s\""
-msgstr ""
+msgstr "\"%s pridané do kolekcie \"%s\""
#: mediagoblin/user_pages/views.py:266
msgid "Please check your entries and try again."
-msgstr ""
+msgstr "ProsÃm skontroluj svoje položky a skús znova."
#: mediagoblin/user_pages/views.py:297
msgid ""
@@ -1006,29 +1029,29 @@ 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 ""
+msgstr "Položka bola z kolekcie odstránená."
#: mediagoblin/user_pages/views.py:383
msgid "The item was not removed because you didn't check that you were sure."
-msgstr ""
+msgstr "Položka nebola odstránená, nakoľko polÃÄko potvrdenia nebolo oznaÄné."
#: mediagoblin/user_pages/views.py:393
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
-msgstr ""
+msgstr "Chystáš sa odstrániÅ¥ položku z kolekcie iného použÃvateľa. Pristupuj opatrne."
#: mediagoblin/user_pages/views.py:426
#, python-format
msgid "You deleted the collection \"%s\""
-msgstr ""
+msgstr "Kolekcia \"%s\" úspešne odstránená."
#: mediagoblin/user_pages/views.py:433
msgid ""
"The collection was not deleted because you didn't check that you were sure."
-msgstr ""
+msgstr "Kolekcia nebola odstránená, nakoľko polÃÄko potrvdenia nebolo oznaÄené."
#: mediagoblin/user_pages/views.py:443
msgid ""
"You are about to delete another user's collection. Proceed with caution."
-msgstr ""
+msgstr "Chystáš sa odstrániÅ¥ kolekciu iného použÃvateľa. Pristupuj opatrne."
diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo
index 38a19ef6..ce422a33 100644
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 d05f1ebc..bc5aaaf2 100644
--- 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-09-24 14:01-0500\n"
-"PO-Revision-Date: 2012-09-24 18:57+0000\n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -92,7 +92,7 @@ msgstr ""
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -103,7 +103,7 @@ msgid "Description of this work"
msgstr ""
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
@@ -119,11 +119,11 @@ msgstr "Oznake"
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Oznaka"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "Oznaka ne sme biti prazna"
@@ -162,20 +162,20 @@ msgstr ""
msgid "New password"
msgstr ""
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr ""
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
@@ -189,33 +189,38 @@ msgstr "Vnos s to oznako za tega uporabnika že obstaja."
msgid "You are editing another user's media. Proceed with caution."
msgstr "Urejate vsebino drugega uporabnika. Nadaljujte pazljivo."
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Urejate uporabniški profil. Nadaljujte pazljivo."
-#: mediagoblin/edit/views.py:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
msgstr ""
-#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
#: mediagoblin/user_pages/views.py:215
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:292
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:309
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
@@ -327,46 +332,27 @@ msgstr "Juhej! Poslano."
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"
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr "Opa!"
-
-#: mediagoblin/templates/mediagoblin/404.html:26
-msgid "There doesn't seem to be a page at this address. Sorry!"
-msgstr "Oprostite. Videti je, da na tem naslovu ni nobene strani."
-
-#: 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."
-msgstr "Äe ste v toÄnost naslova prepriÄani, je bila iskana stran morda premaknjena ali pa izbrisana."
-
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr "Logotip MediaGoblin"
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
-msgstr ""
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
+msgstr "Dodaj vsebino"
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
+msgid "Verify your email!"
msgstr ""
#: mediagoblin/templates/mediagoblin/base.html:75
@@ -390,31 +376,56 @@ msgid ""
"href=\"%(source_link)s\">Source code available."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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 "Podokno obdelovanja vsebine"
+
+#: mediagoblin/templates/mediagoblin/root.html:51
msgid "Explore"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
@@ -422,17 +433,10 @@ msgid ""
" Set up MediaGoblin on your own server"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
msgstr ""
-#: 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 "Podokno obdelovanja vsebine"
-
#: mediagoblin/templates/mediagoblin/admin/panel.html:29
msgid ""
"Here you can track the state of media being processed on this instance."
@@ -541,30 +545,43 @@ msgstr "Pozdravljeni, %(username)s\n\nZa aktivacijo svojega raÄuna GNU MediaGob
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 "Urejanje %(media_title)s"
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr "PrekliÄi"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
msgid "Save changes"
msgstr "Shrani spremembe"
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr "Urejanje %(media_title)s"
+
#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
msgstr ""
@@ -590,13 +607,11 @@ msgstr ""
#: 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 ""
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr ""
@@ -647,7 +662,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
msgstr ""
@@ -691,7 +706,7 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr ""
@@ -700,7 +715,7 @@ msgstr ""
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
msgstr ""
@@ -758,13 +773,8 @@ msgid ""
" %(date)s
"
msgstr ""
-#: 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:192
-msgid "Add attachment"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
@@ -772,11 +782,11 @@ msgstr ""
msgid "Add %(title)s to collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
msgstr ""
@@ -847,41 +857,25 @@ msgstr "Uredi profil"
msgid "This user hasn't filled in their profile (yet)."
msgstr "Ta uporabnik Å¡e ni izpolnil svojega profila."
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr "Prikaži vso vsebino uporabnika %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
msgstr "Tu bo prikazana vaÅ¡a vsebina, a trenutno Å¡e niste dodali niÄ."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
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 ""
-"
\n"
-" %(note)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
@@ -901,7 +895,7 @@ msgstr "Ikona Atom"
msgid "Location"
msgstr ""
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
msgstr ""
@@ -940,6 +934,32 @@ msgstr ""
msgid "Could not read the image file."
msgstr ""
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr "Opa!"
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:28
msgid "I am sure I want to delete this"
msgstr ""
diff --git a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo
index be3b75db..73da40d8 100644
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 5147dcc3..6c7ae9c7 100644
--- a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
+# Besnik Bleta , 2012.
# FIRST AUTHOR , 2012.
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-09-24 14:01-0500\n"
-"PO-Revision-Date: 2012-09-24 18:57+0000\n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/mediagoblin/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -92,7 +93,7 @@ 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/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -103,7 +104,7 @@ msgid "Description of this work"
msgstr "Përshkrim i kësaj pune"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
@@ -119,11 +120,11 @@ msgstr "Etiketa"
msgid "Separate tags by commas."
msgstr "Ndajini etiketat me presje."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Identifikues"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "Identifikuesi s'mund të jetë i zbrazët"
@@ -162,24 +163,24 @@ msgstr "Jepni fjalëkalimin tuaj të vjetër që të provohet se këtë llogari
msgid "New password"
msgstr "Fjalëkalimi i ri"
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
-msgstr ""
+msgstr "Dërgomë email kur të tjerët komentojnë te media ime"
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
-msgstr ""
+msgstr "Titulli s'mund të jetë i zbrazët"
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
-msgstr ""
+msgstr "Përshkrim i këtij koleksioni"
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
-msgstr ""
+msgstr "Pjesa titull e adresës së këtij koleksioni. Zakonisht nuk keni pse e ndryshoni këtë."
#: mediagoblin/edit/views.py:65
msgid "An entry with that slug already exists for this user."
@@ -187,49 +188,54 @@ msgstr "Ka tashmë një zë me atë identifikues për këtë përdorues."
#: 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."
+msgstr "Po përpunoni media të një tjetër përdoruesi. Hapni sytë."
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
msgid "You are editing a user's profile. Proceed with caution."
-msgstr "Po përpunoni profilin e një përdoruesi. Bëni kujdes."
+msgstr "Po përpunoni profilin e një përdoruesi. Hapni sytë."
-#: mediagoblin/edit/views.py:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
msgstr "Ndryshimet e profilit u ruajtën"
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
msgstr "Rregullimet e llogarisë u ruajtën"
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
msgstr "Fjalëkalim i gabuar"
-#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
#: mediagoblin/user_pages/views.py:215
#, python-format
msgid "You already have a collection called \"%s\"!"
-msgstr ""
+msgstr "Keni tashmë një koleksion të quajtur \"%s\"!"
-#: mediagoblin/edit/views.py:292
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
-msgstr ""
+msgstr "Ka tashmë një koleksion me atë identifikues për këtë përdorues."
-#: mediagoblin/edit/views.py:309
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
-msgstr ""
+msgstr "Po përpunoni koleksionin e një tjetër përdoruesi. Hapni sytë."
#: mediagoblin/gmg_commands/theme.py:58
msgid "Cannot link theme... no theme set\n"
-msgstr ""
+msgstr "Nuk krijohet dot lidhje për te tema... nuk ka temë të caktuar\n"
#: mediagoblin/gmg_commands/theme.py:71
msgid "No asset directory for this theme\n"
-msgstr ""
+msgstr "Nuk ka drejtori asetesh për këtë temë\n"
#: mediagoblin/gmg_commands/theme.py:74
msgid "However, old link directory symlink found; removed.\n"
-msgstr ""
+msgstr "Sidoqoftë, u gjet simlidhje e vjetër drejtorie lidhjesh; u hoq.\n"
#: mediagoblin/media_types/__init__.py:60
#: mediagoblin/media_types/__init__.py:120
@@ -238,45 +244,45 @@ msgstr "Na ndjeni, nuk e mbullojmë këtë lloj kartele :("
#: mediagoblin/media_types/video/processing.py:35
msgid "Video transcoding failed"
-msgstr ""
+msgstr "Ndërkodimi i videos dështoi"
#: mediagoblin/plugins/oauth/forms.py:26
msgid "Client ID"
-msgstr ""
+msgstr "ID klienti"
#: mediagoblin/plugins/oauth/forms.py:28
msgid "Next URL"
-msgstr ""
+msgstr "URL-ja Pasuese"
#: mediagoblin/plugins/oauth/forms.py:30
msgid "Allow"
-msgstr ""
+msgstr "Lejoje"
#: mediagoblin/plugins/oauth/forms.py:31
msgid "Deny"
-msgstr ""
+msgstr "Mohoje"
#: mediagoblin/plugins/oauth/forms.py:35
msgid "Name"
-msgstr ""
+msgstr "Emër"
#: mediagoblin/plugins/oauth/forms.py:36
msgid "The name of the OAuth client"
-msgstr ""
+msgstr "Emri i klientit OAuth"
#: mediagoblin/plugins/oauth/forms.py:37
msgid "Description"
-msgstr ""
+msgstr "Përshkrim"
#: mediagoblin/plugins/oauth/forms.py:39
msgid ""
"This will be visible to users allowing your\n"
" application to authenticate as them."
-msgstr ""
+msgstr "Kjo do të jetë e dukshme për përdoruesit,\n duke i lejuar kështu zbatimit tuaj\n të kryejë mirëfilltësim si të qe njëri prej tyre."
#: mediagoblin/plugins/oauth/forms.py:41
msgid "Type"
-msgstr ""
+msgstr "Lloj"
#: mediagoblin/plugins/oauth/forms.py:46
msgid ""
@@ -286,25 +292,25 @@ msgid ""
" Public - The client can't make confidential\n"
" requests to the GNU MediaGoblin instance (e.g. client-side\n"
" JavaScript client)."
-msgstr ""
+msgstr "Konfidenciale - Kklienti mund\n të bëjë kërkesa te instanca GNU MediaGoblin që nuk mund\n të përgjohen nga agjenti i përdoruesit (p.sh. klient te shërbyesi).
\n Publike - Klienti nuk mund të bëjë kërkesa\n konfidenciale te instanca GNU MediaGoblin (p.sh. klient\n JavaScript i vetë klientit)."
#: mediagoblin/plugins/oauth/forms.py:53
msgid "Redirect URI"
-msgstr ""
+msgstr "URI Ridrejtimi"
#: mediagoblin/plugins/oauth/forms.py:55
msgid ""
"The redirect URI for the applications, this field\n"
" is required for public clients."
-msgstr ""
+msgstr "URI ridrejtimi për zbatimin, kjo fushë\n është e domosdoshme për klientë publikë."
#: mediagoblin/plugins/oauth/forms.py:67
msgid "This field is required for public clients"
-msgstr ""
+msgstr "Kjo fushë është e domosdoshme për klientë publikë"
#: mediagoblin/plugins/oauth/views.py:59
msgid "The client {0} has been registered!"
-msgstr ""
+msgstr "Klienti {0} u regjistrua!"
#: mediagoblin/processing/__init__.py:138
msgid "Invalid file given for media type."
@@ -325,49 +331,30 @@ msgstr "Yhaaaaaa! U parashtrua!"
#: 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"
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr "Oooh!"
-
-#: mediagoblin/templates/mediagoblin/404.html:26
-msgid "There doesn't seem to be a page at this address. Sorry!"
-msgstr "Nuk duket të ketë ndonjë faqe te kjo adresë. Na ndjeni!"
-
-#: 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."
-msgstr "Nëse jeni i sigurt se adresa është e saktë, ndoshta faqja që po kërkoni është fshirë ose kaluar gjetkë."
+msgstr "U shtua koleksioni \"%s\"!"
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr "Logoja e MediaGoblin-it"
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr "Verifikoni email-in tuaj!"
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
-msgstr "+ Shtoni media"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
-msgstr "Shihni profilin tuaj"
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
+msgstr "Shtoni media"
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
-msgstr "Dilni"
+msgid "Verify your email!"
+msgstr "Verifikoni email-in tuaj!"
#: mediagoblin/templates/mediagoblin/base.html:75
#: mediagoblin/templates/mediagoblin/auth/login.html:28
@@ -390,31 +377,56 @@ msgid ""
"href=\"%(source_link)s\">Source code available."
msgstr "Hedhur në qarkullim sipas AGPL-së. Kodi burim është i passhëm."
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr "Ndryshoni rregullime llogarie"
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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 "Paneli i Përpunimit të Medias"
+
+#: mediagoblin/templates/mediagoblin/root.html:51
msgid "Explore"
msgstr "Eksploroni"
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr "Tungjatjeta juaj, mirë se vini te ky site MediaGoblin!"
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
msgstr "Ky site përdor MediaGoblin, një program jashtëzakonisht i shkëlqyer për strehim mediash."
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
-msgstr ""
+msgstr "Për të shtuar media tuajën, për të bërë komente, dhe të tjera, mund të hyni përmes llogarisë suaj MediaGoblin."
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
msgstr "Nuk keni ende një të tillë? Ãshtë e lehtë!"
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
@@ -422,21 +434,14 @@ msgid ""
" Set up MediaGoblin on your own server"
msgstr "Krijoni një llogarin te ky site\n ose\n Instaloni dhe rregulloni MediaGoblin-in te shërbyesi juaj"
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
msgstr "Mediat më të reja"
-#: 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 "Paneli i Përpunimit të Medias"
-
#: mediagoblin/templates/mediagoblin/admin/panel.html:29
msgid ""
"Here you can track the state of media being processed on this instance."
-msgstr ""
+msgstr "Këtu mund të ndiqni gjendjen e medias që po përpunohet në këtë instancë."
#: mediagoblin/templates/mediagoblin/admin/panel.html:32
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
@@ -456,16 +461,16 @@ msgstr "Nuk arritën të kryheshin këto ngarkime:"
#: mediagoblin/templates/mediagoblin/admin/panel.html:90
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
msgid "No failed entries!"
-msgstr ""
+msgstr "Pa zëra të dështuar!"
#: mediagoblin/templates/mediagoblin/admin/panel.html:92
msgid "Last 10 successful uploads"
-msgstr ""
+msgstr "10 Ngarkimet e Fundit të Suksesshme"
#: mediagoblin/templates/mediagoblin/admin/panel.html:112
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
msgid "No processed entries, yet!"
-msgstr ""
+msgstr "Ende pa zëra të përpunuar!"
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
@@ -539,32 +544,45 @@ msgstr "Njatjeta %(username)s,\n\nqë të aktivizoni llogarinë tuaj te GNU Medi
#: mediagoblin/templates/mediagoblin/edit/attachments.html:35
#, python-format
msgid "Editing attachments for %(media_title)s"
-msgstr ""
+msgstr "Po përpunohen bashkangjitjet për %(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 "Po përpunohet %(media_title)s"
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
+msgstr "Bashkangjitje"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr "Shtoni bashkangjitje"
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr "Anuloje"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
msgid "Save changes"
msgstr "Ruaji ndryshimet"
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr "Po përpunohet %(media_title)s"
+
#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
msgstr "Po ndryshohen rregullimet e llogarisë %(username)s"
@@ -572,7 +590,7 @@ msgstr "Po ndryshohen rregullimet e llogarisë %(username)s"
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
-msgstr ""
+msgstr "Po përpunohet %(collection_title)s"
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
@@ -590,13 +608,11 @@ msgstr "Media e etiketuar me:: %(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 "Shkarkojeni"
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr "Origjinal"
@@ -617,7 +633,7 @@ msgstr "Një shfletues web modern që mund të luajë \n\taudion mund ta merrni
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
#: mediagoblin/templates/mediagoblin/media_displays/video.html:56
msgid "Original file"
-msgstr ""
+msgstr "Kartela origjinale"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
msgid "WebM file (Vorbis codec)"
@@ -639,15 +655,15 @@ msgstr "Një shfletues web modern që \n\t mund ta luajë këtë video mund t
#: mediagoblin/templates/mediagoblin/media_displays/video.html:59
msgid "WebM file (640p; VP8/Vorbis)"
-msgstr ""
+msgstr "Kartelë WebM (640p; VP8/Vorbis)"
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
-msgstr ""
+msgstr "Shtoni një koleksion"
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
msgstr "Shtoni"
@@ -659,12 +675,12 @@ msgstr "Shtoni media tuajën"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
#, python-format
msgid "%(collection_title)s (%(username)s's collection)"
-msgstr ""
+msgstr "%(collection_title)s (koleksione nga %(username)s)"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
#, python-format
msgid "%(collection_title)s by %(username)s"
-msgstr ""
+msgstr "%(collection_title)s nga %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
@@ -682,7 +698,7 @@ msgid ""
"\n"
" %(collection_description)s\n"
"
"
-msgstr ""
+msgstr "\n %(collection_description)s\n
"
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -691,25 +707,25 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
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 ""
+msgstr "Të hiqet vërtet %(media_title)s nga %(collection_title)s?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
-msgstr ""
+msgstr "Hiqe"
#: 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 "Tungjatjeta %(username)s,\n%(comment_author)s ka komentuar te postimi juaj (%(comment_url)s) në %(instance_name)s\n"
#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
#, python-format
@@ -758,27 +774,22 @@ msgid ""
" %(date)s
"
msgstr "Shtuar më
\n %(date)s
"
-#: 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:192
-msgid "Add attachment"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
#, python-format
msgid "Add %(title)s to collection"
-msgstr ""
+msgstr "Shtoni %(title)s te koleksioni juaj"
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
-msgstr ""
+msgstr "+"
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
-msgstr ""
+msgstr "Shtoni një koleksion të ri"
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
msgid ""
@@ -787,7 +798,7 @@ msgstr "Gjendjen e medias që po përpunohet për galerinë tuaj mund ta ndiqni
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
msgid "Your last 10 successful uploads"
-msgstr ""
+msgstr "10 ngarkimet tuaja më të suksesshme"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:31
#: mediagoblin/templates/mediagoblin/user_pages/user.html:89
@@ -847,47 +858,31 @@ msgstr "Përpunoni profil"
msgid "This user hasn't filled in their profile (yet)."
msgstr "Ky përdorues nuk e ka plotësuar (ende) profilin e vet."
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr "Ndryshoni rregullime llogarie"
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr "Shihni krejt mediat nga %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
msgstr "Media juaj do të shfaqet këtu, por nuk duket të keni shtuar gjë ende."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
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 ""
-"
\n"
-" %(note)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
#, python-format
msgid "In collections (%(collected)s)"
-msgstr ""
+msgstr "Te koleksionet (%(collected)s)"
#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
msgid "feed icon"
@@ -901,7 +896,7 @@ msgstr "Prurje Atom"
msgid "Location"
msgstr "Vend"
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
msgstr "Shiheni te OpenStreetMap"
@@ -940,25 +935,51 @@ msgstr "Etiketuar me"
msgid "Could not read the image file."
msgstr "Nuk lexoi dot kartelën e figurës."
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr "Oooh!"
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
#: 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 ""
+msgstr "Jam i sigurt se dua që të hiqet ky objekt prek koleksioni"
#: mediagoblin/user_pages/forms.py:35
msgid "-- Select --"
-msgstr ""
+msgstr "-- Përzgjidhni --"
#: mediagoblin/user_pages/forms.py:37
msgid "Include a note"
-msgstr ""
+msgstr "Përfshini një shënim"
#: mediagoblin/user_pages/lib.py:56
msgid "commented on your post"
-msgstr ""
+msgstr "komentoi te postimi juaj"
#: mediagoblin/user_pages/views.py:161
msgid "Oops, your comment was empty."
@@ -970,26 +991,26 @@ msgstr "Komenti juaj u postua!"
#: mediagoblin/user_pages/views.py:235
msgid "You have to select or add a collection"
-msgstr ""
+msgstr "Duhet të përzgjidhni ose shtoni një koleksion"
#: mediagoblin/user_pages/views.py:243
#, python-format
msgid "\"%s\" already in collection \"%s\""
-msgstr ""
+msgstr "\"%s\" gjendet tashmë te koleksioni \"%s\""
#: mediagoblin/user_pages/views.py:258
#, python-format
msgid "\"%s\" added to collection \"%s\""
-msgstr ""
+msgstr "\"%s\" u shtua te koleksioni \"%s\""
#: mediagoblin/user_pages/views.py:266
msgid "Please check your entries and try again."
-msgstr ""
+msgstr "Ju lutemi, kontrolloni zërat tuaj dhe riprovoni."
#: mediagoblin/user_pages/views.py:297
msgid ""
"Some of the files with this entry seem to be missing. Deleting anyway."
-msgstr ""
+msgstr "Duket se mungojnë disa nga kartelat në këtë zë. Po fshihet, sido qoftë."
#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
@@ -1001,33 +1022,33 @@ msgstr "Media nuk u fshi ngaqë nuk i vutë shenjë pohimit se jeni i sigurt."
#: 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."
+msgstr "Ju ndan një hap nga fshirja e medias të një tjetër përdoruesi. Hapni sytë."
#: mediagoblin/user_pages/views.py:379
msgid "You deleted the item from the collection."
-msgstr ""
+msgstr "E fshitë objektin prej koleksionit."
#: mediagoblin/user_pages/views.py:383
msgid "The item was not removed because you didn't check that you were sure."
-msgstr ""
+msgstr "Objekti nuk u fshi ngaqë, nuk pohuat se jeni të sigurt për këtë."
#: mediagoblin/user_pages/views.py:393
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
-msgstr ""
+msgstr "Ju ndan një hap nga fshirja e një objekti prej koleksionit të një përdoruesi tjetër. Hapni sytë."
#: mediagoblin/user_pages/views.py:426
#, python-format
msgid "You deleted the collection \"%s\""
-msgstr ""
+msgstr "E fshitë koleksionin \"%s\""
#: mediagoblin/user_pages/views.py:433
msgid ""
"The collection was not deleted because you didn't check that you were sure."
-msgstr ""
+msgstr "Koleksioni nuk u fshi ngaqë, nuk pohuat se jeni të sigurt për këtë."
#: mediagoblin/user_pages/views.py:443
msgid ""
"You are about to delete another user's collection. Proceed with caution."
-msgstr ""
+msgstr "Ju ndan një hap nga fshirja e koleksionit të një përdoruesi tjetër. Hapni sytë."
diff --git a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo
index 132ae65d..a4a9cdc6 100644
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 168337b2..360b5309 100644
--- 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-09-24 14:01-0500\n"
-"PO-Revision-Date: 2012-09-24 18:57+0000\n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/mediagoblin/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -91,7 +91,7 @@ msgstr ""
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -102,7 +102,7 @@ msgid "Description of this work"
msgstr ""
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
@@ -118,11 +118,11 @@ msgstr ""
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr ""
@@ -161,20 +161,20 @@ msgstr ""
msgid "New password"
msgstr ""
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr ""
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
@@ -188,33 +188,38 @@ msgstr ""
msgid "You are editing another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
msgid "You are editing a user's profile. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
msgstr ""
-#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
#: mediagoblin/user_pages/views.py:215
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:292
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:309
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
@@ -326,46 +331,27 @@ msgstr ""
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/404.html:24
-msgid "Image of 404 goblin stressing out"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/404.html:26
-msgid "There doesn't seem to be a page at this address. Sorry!"
-msgstr ""
-
-#: 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."
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
msgstr ""
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
+msgid "Verify your email!"
msgstr ""
#: mediagoblin/templates/mediagoblin/base.html:75
@@ -389,31 +375,56 @@ msgid ""
"href=\"%(source_link)s\">Source code available."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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 ""
+
+#: mediagoblin/templates/mediagoblin/root.html:51
msgid "Explore"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
@@ -421,17 +432,10 @@ msgid ""
" Set up MediaGoblin on your own server"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
msgstr ""
-#: 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 ""
-
#: mediagoblin/templates/mediagoblin/admin/panel.html:29
msgid ""
"Here you can track the state of media being processed on this instance."
@@ -540,30 +544,43 @@ msgstr ""
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"
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
msgid "Save changes"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
msgstr ""
@@ -589,13 +606,11 @@ msgstr ""
#: 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 ""
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr ""
@@ -646,7 +661,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
msgstr ""
@@ -690,7 +705,7 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr ""
@@ -699,7 +714,7 @@ msgstr ""
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
msgstr ""
@@ -757,13 +772,8 @@ msgid ""
" %(date)s
"
msgstr ""
-#: 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:192
-msgid "Add attachment"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
@@ -771,11 +781,11 @@ msgstr ""
msgid "Add %(title)s to collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
msgstr ""
@@ -846,41 +856,25 @@ msgstr ""
msgid "This user hasn't filled in their profile (yet)."
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
msgid "There doesn't seem to be any media here yet..."
msgstr ""
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
-#, python-format
-msgid ""
-"
\n"
-" %(note)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
@@ -900,7 +894,7 @@ msgstr ""
msgid "Location"
msgstr ""
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
msgstr ""
@@ -939,6 +933,32 @@ msgstr ""
msgid "Could not read the image file."
msgstr ""
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr ""
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:28
msgid "I am sure I want to delete this"
msgstr ""
diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo
index e2a0bc66..7d65083b 100644
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 fda30875..859c1fd9 100644
--- 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-09-24 14:01-0500\n"
-"PO-Revision-Date: 2012-09-24 18:57+0000\n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/mediagoblin/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -93,7 +93,7 @@ msgstr ""
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -104,7 +104,7 @@ msgid "Description of this work"
msgstr "Beskrivning av verket"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
@@ -120,11 +120,11 @@ msgstr "Taggar"
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Sökvägsnamn"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "Sökvägsnamnet kan inte vara tomt"
@@ -163,20 +163,20 @@ msgstr ""
msgid "New password"
msgstr ""
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr ""
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
@@ -190,33 +190,38 @@ msgstr "Ett inlägg med det sökvägsnamnet existerar redan."
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:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
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:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
msgstr "Fel lösenord"
-#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
#: mediagoblin/user_pages/views.py:215
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:292
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:309
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
@@ -328,47 +333,28 @@ msgstr "Tjohoo! Upladdat!"
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/404.html:24
-msgid "Image of 404 goblin stressing out"
-msgstr "Bild av stressat 404-troll."
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr "Ojoj!"
-
-#: mediagoblin/templates/mediagoblin/404.html:26
-msgid "There doesn't seem to be a page at this address. Sorry!"
-msgstr "Ledsen, det verkar inte vara någonting här."
-
-#: 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."
-msgstr "Om du är säker på att adressen stämmer så kanske sidan du letar efter har flyttats eller tagits bort."
-
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr "MediaGoblin-logotyp"
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr "Verifiera din e-postadress"
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
-msgstr ""
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
+msgstr "Lägg till media"
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
-msgstr ""
+msgid "Verify your email!"
+msgstr "Verifiera din e-postadress"
#: mediagoblin/templates/mediagoblin/base.html:75
#: mediagoblin/templates/mediagoblin/auth/login.html:28
@@ -391,31 +377,56 @@ msgid ""
"href=\"%(source_link)s\">Source code available."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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 "Mediabehandlingspanel"
+
+#: mediagoblin/templates/mediagoblin/root.html:51
msgid "Explore"
msgstr "Utforska"
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr "Hej, välkommen till den här MediaGoblin-sidan!"
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
msgstr "Har du inte ett redan?"
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
@@ -423,17 +434,10 @@ msgid ""
" Set up MediaGoblin on your own server"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
msgstr "Senast medier"
-#: 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 "Mediabehandlingspanel"
-
#: mediagoblin/templates/mediagoblin/admin/panel.html:29
msgid ""
"Here you can track the state of media being processed on this instance."
@@ -542,30 +546,43 @@ msgstr "Hej %(username)s,\n\nöppna den följande webbadressen i din webbläsare
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 "Redigerar %(media_title)s"
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr "Avbryt"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
msgid "Save changes"
msgstr "Spara ändringar"
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr "Redigerar %(media_title)s"
+
#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
msgstr ""
@@ -591,13 +608,11 @@ msgstr "Media taggat med: %(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 ""
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr "Original"
@@ -648,7 +663,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
msgstr ""
@@ -692,7 +707,7 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr ""
@@ -701,7 +716,7 @@ msgstr ""
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
msgstr ""
@@ -759,13 +774,8 @@ msgid ""
" %(date)s
"
msgstr ""
-#: 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:192
-msgid "Add attachment"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
@@ -773,11 +783,11 @@ msgstr ""
msgid "Add %(title)s to collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
msgstr ""
@@ -848,41 +858,25 @@ msgstr "Redigera profil"
msgid "This user hasn't filled in their profile (yet)."
msgstr "Den här användaren har inte fyllt i sin profilsida ännu."
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr "Se all media från %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
msgstr "Här kommer din media att dyka upp, du verkar inte ha lagt till någonting ännu."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
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 ""
-"
\n"
-" %(note)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
@@ -902,7 +896,7 @@ msgstr "Atom-feed"
msgid "Location"
msgstr ""
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
msgstr ""
@@ -941,6 +935,32 @@ msgstr ""
msgid "Could not read the image file."
msgstr ""
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr "Ojoj!"
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
#: 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"
diff --git a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo
index e341a891..fca78822 100644
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 17d5910c..7b35dcf4 100644
--- 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-09-24 14:01-0500\n"
-"PO-Revision-Date: 2012-09-24 18:57+0000\n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -92,7 +92,7 @@ msgstr ""
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -103,7 +103,7 @@ msgid "Description of this work"
msgstr ""
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
@@ -119,11 +119,11 @@ msgstr ""
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr ""
@@ -162,20 +162,20 @@ msgstr ""
msgid "New password"
msgstr ""
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr ""
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
@@ -189,33 +189,38 @@ msgstr ""
msgid "You are editing another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
msgid "You are editing a user's profile. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
msgstr ""
-#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
#: mediagoblin/user_pages/views.py:215
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:292
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:309
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
@@ -327,46 +332,27 @@ msgstr ""
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/404.html:24
-msgid "Image of 404 goblin stressing out"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/404.html:26
-msgid "There doesn't seem to be a page at this address. Sorry!"
-msgstr ""
-
-#: 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."
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
msgstr ""
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
+msgid "Verify your email!"
msgstr ""
#: mediagoblin/templates/mediagoblin/base.html:75
@@ -390,31 +376,56 @@ msgid ""
"href=\"%(source_link)s\">Source code available."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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 ""
+
+#: mediagoblin/templates/mediagoblin/root.html:51
msgid "Explore"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
@@ -422,17 +433,10 @@ msgid ""
" Set up MediaGoblin on your own server"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
msgstr ""
-#: 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 ""
-
#: mediagoblin/templates/mediagoblin/admin/panel.html:29
msgid ""
"Here you can track the state of media being processed on this instance."
@@ -541,30 +545,43 @@ msgstr ""
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"
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr "à°°à°¦à±à°¦à±à°à±à°¯à°¿"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
msgid "Save changes"
msgstr "మారà±à°ªà±à°²à°¨à± à°à°¦à±à°°à°ªà°°à°à±"
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
msgstr ""
@@ -590,13 +607,11 @@ msgstr ""
#: 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 ""
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr ""
@@ -647,7 +662,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
msgstr ""
@@ -691,7 +706,7 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr ""
@@ -700,7 +715,7 @@ msgstr ""
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
msgstr ""
@@ -758,13 +773,8 @@ msgid ""
" %(date)s
"
msgstr ""
-#: 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:192
-msgid "Add attachment"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
@@ -772,11 +782,11 @@ msgstr ""
msgid "Add %(title)s to collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
msgstr ""
@@ -847,41 +857,25 @@ msgstr ""
msgid "This user hasn't filled in their profile (yet)."
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
msgid "There doesn't seem to be any media here yet..."
msgstr ""
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
-#, python-format
-msgid ""
-"
\n"
-" %(note)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
@@ -901,7 +895,7 @@ msgstr ""
msgid "Location"
msgstr ""
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
msgstr ""
@@ -940,6 +934,32 @@ msgstr ""
msgid "Could not read the image file."
msgstr ""
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr ""
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:28
msgid "I am sure I want to delete this"
msgstr ""
diff --git a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo
index 99f0c85b..137bc4de 100644
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 0729a2e7..a917fc5e 100644
--- 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-09-24 14:01-0500\n"
-"PO-Revision-Date: 2012-09-24 18:57+0000\n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: Chinese (Taiwan) (Big5) (http://www.transifex.com/projects/p/mediagoblin/language/zh_TW.Big5/)\n"
"MIME-Version: 1.0\n"
@@ -91,7 +91,7 @@ msgstr ""
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -102,7 +102,7 @@ msgid "Description of this work"
msgstr ""
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
@@ -118,11 +118,11 @@ msgstr ""
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr ""
@@ -161,20 +161,20 @@ msgstr ""
msgid "New password"
msgstr ""
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr ""
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
@@ -188,33 +188,38 @@ msgstr ""
msgid "You are editing another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
msgid "You are editing a user's profile. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
msgstr ""
-#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
#: mediagoblin/user_pages/views.py:215
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:292
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:309
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
@@ -326,46 +331,27 @@ msgstr ""
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/404.html:24
-msgid "Image of 404 goblin stressing out"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/404.html:26
-msgid "There doesn't seem to be a page at this address. Sorry!"
-msgstr ""
-
-#: 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."
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
msgstr ""
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
+msgid "Verify your email!"
msgstr ""
#: mediagoblin/templates/mediagoblin/base.html:75
@@ -389,31 +375,56 @@ msgid ""
"href=\"%(source_link)s\">Source code available."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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 ""
+
+#: mediagoblin/templates/mediagoblin/root.html:51
msgid "Explore"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
@@ -421,17 +432,10 @@ msgid ""
" Set up MediaGoblin on your own server"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
msgstr ""
-#: 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 ""
-
#: mediagoblin/templates/mediagoblin/admin/panel.html:29
msgid ""
"Here you can track the state of media being processed on this instance."
@@ -540,30 +544,43 @@ msgstr ""
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"
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
msgid "Save changes"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
msgstr ""
@@ -589,13 +606,11 @@ msgstr ""
#: 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 ""
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
msgstr ""
@@ -646,7 +661,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
msgstr ""
@@ -690,7 +705,7 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr ""
@@ -699,7 +714,7 @@ msgstr ""
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
msgstr ""
@@ -757,13 +772,8 @@ msgid ""
" %(date)s
"
msgstr ""
-#: 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:192
-msgid "Add attachment"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
@@ -771,11 +781,11 @@ msgstr ""
msgid "Add %(title)s to collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
msgstr ""
@@ -846,41 +856,25 @@ msgstr ""
msgid "This user hasn't filled in their profile (yet)."
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
msgid "There doesn't seem to be any media here yet..."
msgstr ""
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
-#, python-format
-msgid ""
-"
\n"
-" %(note)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
@@ -900,7 +894,7 @@ msgstr ""
msgid "Location"
msgstr ""
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
msgstr ""
@@ -939,6 +933,32 @@ msgstr ""
msgid "Could not read the image file."
msgstr ""
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr ""
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:28
msgid "I am sure I want to delete this"
msgstr ""
diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo
index 379f1bdc..5ce25b48 100644
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 b8673f51..c24c7004 100644
--- a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po
@@ -4,13 +4,13 @@
#
# Translators:
# , 2011.
-# Harry Chen , 2011, 2012.
+# Harry Chen , 2011-2012.
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-09-24 14:01-0500\n"
-"PO-Revision-Date: 2012-09-24 18:57+0000\n"
+"POT-Creation-Date: 2012-12-03 13:23-0600\n"
+"PO-Revision-Date: 2012-12-03 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -30,11 +30,11 @@ msgstr "å¯ç¢¼"
#: mediagoblin/auth/forms.py:34
msgid "Email address"
-msgstr "é»åéµä»¶ä½ç½®"
+msgstr "Email ä½å"
#: mediagoblin/auth/forms.py:51
msgid "Username or email"
-msgstr "使ç¨è
å稱ææ¯é»åéµä»¶"
+msgstr "使ç¨è
å稱æ email"
#: mediagoblin/auth/forms.py:58
msgid "Incorrect input"
@@ -42,48 +42,48 @@ msgstr "輸å
¥é¯èª¤"
#: mediagoblin/auth/views.py:55
msgid "Sorry, registration is disabled on this instance."
-msgstr "æ±æ, éåé
ç®å·²ç¶è¢«æ«å註å."
+msgstr "æ±æï¼æ¬ç«å·²ç¶æ«å註åã"
#: mediagoblin/auth/views.py:75
msgid "Sorry, a user with that name already exists."
-msgstr "æ±æ, éå使ç¨è
å稱已ç¶åå¨."
+msgstr "æ±æï¼éå使ç¨è
å稱已ç¶åå¨ã"
#: mediagoblin/auth/views.py:79
msgid "Sorry, a user with that email address already exists."
-msgstr "æ±æï¼æ¤é»åéµä»¶å·²è¢«è¨»åäºã"
+msgstr "æ±æï¼æ¤ email ä½ç½®å·²ç¶è¢«è¨»åäºã"
#: mediagoblin/auth/views.py:182
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
-msgstr "ä½ çé»åéµä»¶ä½å已被èªè. ä½ ç¾å¨å°±å¯ä»¥ç»å
¥, ç·¨è¼¯ä½ çå人æªæ¡èä¸é交ç
§ç!"
+msgstr "æ¨ç email ä½å已被èªèãæ¨å·²ç¶å¯ä»¥ç»å
¥ï¼ç·¨è¼¯æ¨çå人æªæ¡ä¸¦ä¸å³åçï¼"
#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
-msgstr "èªè碼ææ¯ä½¿ç¨è
帳èé¯èª¤"
+msgstr "èªè碼ææ¯ä½¿ç¨è
ID é¯èª¤"
#: mediagoblin/auth/views.py:206
msgid "You must be logged in so we know who to send the email to!"
-msgstr "ä½ å¿
é ç»å
¥ï¼æåæç¥éä¿¡è¦é給誰ï¼"
+msgstr "æ¨å¿
é ç»å
¥ï¼æåæç¥éä¿¡è¦é給誰ï¼"
#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
-msgstr "ä½ çé»åéµä»¶å·²ç¶ç¢ºèªäºï¼"
+msgstr "æ¨çé»åéµä»¶å·²ç¶ç¢ºèªäºï¼"
#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
-msgstr "ééèªèä¿¡."
+msgstr "ééèªèä¿¡ã"
#: mediagoblin/auth/views.py:263
msgid ""
"An email has been sent with instructions on how to change your password."
-msgstr "ä¿®æ¹å¯ç¢¼çæ示已ç¶ç±é»åéµä»¶å¯éå°ä½ çä¿¡ç®±ã"
+msgstr "ä¿®æ¹å¯ç¢¼çæ示已ç¶ç±é»åéµä»¶å¯éå°æ¨çä¿¡ç®±ã"
#: mediagoblin/auth/views.py:273
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
-msgstr "ç¡æ³å³éå¯ç¢¼å復信件ï¼å çºä½ ç使ç¨è
å稱已失æææ¯å¸³èå°æªèªèã"
+msgstr "ç¡æ³å³éå¯ç¢¼å復信件ï¼å çºæ¨ç使ç¨è
å稱已失æææ¯å¸³èå°æªèªèã"
#: mediagoblin/auth/views.py:285
msgid "Couldn't find someone with that username or email."
@@ -91,9 +91,9 @@ msgstr "æ¾ä¸å°ç¸éç使ç¨è
å稱ææ¯é»åéµä»¶ã"
#: mediagoblin/auth/views.py:333
msgid "You can now log in using your new password."
-msgstr "ä½ ç¾å¨å¯ä»¥ç¨æ°çå¯ç¢¼ç»å
¥äºï¼"
+msgstr "æ¨ç¾å¨å¯ä»¥ç¨æ°çå¯ç¢¼ç»å
¥äºï¼"
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:40
msgid "Title"
@@ -104,13 +104,13 @@ msgid "Description of this work"
msgstr "éåä½åçæè¿°"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
-msgstr "ä½ å¯ä»¥ç¨\n \n Markdown ä¾æç."
+msgstr "æ¨å¯ä»¥ç¨ Markdown ä¾æçã"
#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
msgid "Tags"
@@ -120,19 +120,19 @@ msgstr "æ¨ç±¤"
msgid "Separate tags by commas."
msgstr "ç¨éèåéæ¨ç±¤ã"
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
-msgstr "èªè¨å串"
+msgstr "簡稱"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
-msgstr "èªè¨å串ä¸è½ç©ºç½"
+msgstr "簡稱ä¸è½çºç©ºç½"
#: mediagoblin/edit/forms.py:40
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
-msgstr "æ¤åªé«ç¶²åçå稱ãä½ é常ä¸éè¦è®åéåçã"
+msgstr "æ¤åªé«ç¶²åçæ¨é¡é¨ä»½ãé常ä¸éè¦ä¿®æ¹ã"
#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
@@ -149,7 +149,7 @@ msgstr "網ç«"
#: mediagoblin/edit/forms.py:58
msgid "This address contains errors"
-msgstr "網åæ¯ä¸æ¯æé¯äº? "
+msgstr "æ¬ç¶²ååºé¯äº"
#: mediagoblin/edit/forms.py:63
msgid "Old password"
@@ -157,80 +157,85 @@ msgstr "èçå¯ç¢¼"
#: mediagoblin/edit/forms.py:64
msgid "Enter your old password to prove you own this account."
-msgstr "輸å
¥ä½ çèå¯ç¢¼ä¾èæä½ ææéå帳èã"
+msgstr "輸å
¥æ¨çèå¯ç¢¼ä¾èææ¨ææéå帳èã"
#: mediagoblin/edit/forms.py:67
msgid "New password"
msgstr "æ°å¯ç¢¼"
-#: mediagoblin/edit/forms.py:72
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
-msgstr ""
+msgstr "ç¶æ人å°æçåªé«è©è«æå¯ä¿¡çµ¦æ"
-#: mediagoblin/edit/forms.py:84
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
-msgstr ""
+msgstr "æ¨é¡ä¸è½æ¯ç©ºç"
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:43
msgid "Description of this collection"
-msgstr ""
+msgstr "éåèèçæè¿°"
-#: mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
-msgstr ""
+msgstr "æ¤èè網åçæ¨é¡é¨ä»½ï¼é常ä¸éè¦ä¿®æ¹ã"
#: mediagoblin/edit/views.py:65
msgid "An entry with that slug already exists for this user."
-msgstr "éåèªè¨å串已ç¶è¢«å
¶ä»äººç¨äº"
+msgstr "éå簡稱已ç¶è¢«å
¶ä»äººç¨äº"
#: mediagoblin/edit/views.py:86
msgid "You are editing another user's media. Proceed with caution."
-msgstr "ä½ æ£å¨ç·¨è¼¯ä»äººçåªé«æªæ¡. è«è¬¹æ
èç."
+msgstr "æ¨æ£å¨ä¿®æ¹å¥äººçåªé«ï¼è«å°å¿æä½ã"
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:156
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:181
msgid "You are editing a user's profile. Proceed with caution."
-msgstr "ä½ æ£å¨ç·¨è¼¯ä¸ä½ç¨æ¶çæªæ¡. è«è¬¹æ
èç."
+msgstr "æ¨æ£å¨ä¿®æ¹å¥äººçå人æªæ¡ï¼è«å°å¿æä½ã"
-#: mediagoblin/edit/views.py:198
+#: mediagoblin/edit/views.py:197
msgid "Profile changes saved"
-msgstr "ä¿®æ¹çæªæ¡å·²åæª"
+msgstr "å人æªæ¡ä¿®æ¹å·²å²å"
-#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247
+#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
msgid "Account settings saved"
-msgstr "帳èè¨å®å·²åæª"
+msgstr "帳èè¨å®å·²å²å"
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:251
msgid "Wrong password"
msgstr "å¯ç¢¼é¯èª¤"
-#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211
+#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
#: mediagoblin/user_pages/views.py:215
#, python-format
msgid "You already have a collection called \"%s\"!"
-msgstr ""
+msgstr "æ¨å·²ç¶æä¸å稱åã%sãçèèäºï¼"
-#: mediagoblin/edit/views.py:292
+#: mediagoblin/edit/views.py:291
msgid "A collection with that slug already exists for this user."
-msgstr ""
+msgstr "éå使ç¨è
å·²ç¶æ使ç¨è©²ç°¡ç¨±çèèäºã"
-#: mediagoblin/edit/views.py:309
+#: mediagoblin/edit/views.py:308
msgid "You are editing another user's collection. Proceed with caution."
-msgstr ""
+msgstr "æ¨æ£å¨ä¿®æ¹å¥äººçèèï¼è«å°å¿æä½ã"
#: mediagoblin/gmg_commands/theme.py:58
msgid "Cannot link theme... no theme set\n"
-msgstr ""
+msgstr "ç¡æ³é£çµä½æ¯â¦æ²ææ¤ä½æ¯\n"
#: mediagoblin/gmg_commands/theme.py:71
msgid "No asset directory for this theme\n"
-msgstr ""
+msgstr "æ¤ä½æ¯æ²æç´ æç®é\n"
#: mediagoblin/gmg_commands/theme.py:74
msgid "However, old link directory symlink found; removed.\n"
-msgstr ""
+msgstr "ä½æ¯èçç®éé£çµå·²ç¶æ¾å°ä¸¦ç§»é¤ã\n"
#: mediagoblin/media_types/__init__.py:60
#: mediagoblin/media_types/__init__.py:120
@@ -239,45 +244,45 @@ msgstr "æ±æï¼æä¸æ¯æ´é樣çæªæ¡æ ¼å¼ :("
#: mediagoblin/media_types/video/processing.py:35
msgid "Video transcoding failed"
-msgstr ""
+msgstr "å½±åè½ç¢¼å¤±æ"
#: mediagoblin/plugins/oauth/forms.py:26
msgid "Client ID"
-msgstr ""
+msgstr "å®¢æ¶ ID"
#: mediagoblin/plugins/oauth/forms.py:28
msgid "Next URL"
-msgstr ""
+msgstr "ä¸ä¸å URL"
#: mediagoblin/plugins/oauth/forms.py:30
msgid "Allow"
-msgstr ""
+msgstr "å
許"
#: mediagoblin/plugins/oauth/forms.py:31
msgid "Deny"
-msgstr ""
+msgstr "æçµ"
#: mediagoblin/plugins/oauth/forms.py:35
msgid "Name"
-msgstr ""
+msgstr "å稱"
#: mediagoblin/plugins/oauth/forms.py:36
msgid "The name of the OAuth client"
-msgstr ""
+msgstr "OAuth client çå稱"
#: mediagoblin/plugins/oauth/forms.py:37
msgid "Description"
-msgstr ""
+msgstr "æè¿°"
#: mediagoblin/plugins/oauth/forms.py:39
msgid ""
"This will be visible to users allowing your\n"
" application to authenticate as them."
-msgstr ""
+msgstr "æ¬æè¿°å°æ被é²è¡æç¨ç¨å¼èªè¨¼ç使ç¨è
çå°ã"
#: mediagoblin/plugins/oauth/forms.py:41
msgid "Type"
-msgstr ""
+msgstr "é¡å"
#: mediagoblin/plugins/oauth/forms.py:46
msgid ""
@@ -287,25 +292,25 @@ msgid ""
" Public - The client can't make confidential\n"
" requests to the GNU MediaGoblin instance (e.g. client-side\n"
" JavaScript client)."
-msgstr ""
+msgstr "ç§å¯ â OAuth client å¯ä»¥å° GNU MediaGoblin ç«å°ç¼éä¸è¢«ä½¿ç¨è
代çææªçè«æ± (ä¾å¦ä¼ºæ端ç client)ã\nå
¬é â OAuth client ç¡æ³å° GNU MediaGoblin ç«å°ç¼éç§å¯çè«æ± (ä¾å¦å®¢æ¶ç«¯ç JavaScript client)ã"
#: mediagoblin/plugins/oauth/forms.py:53
msgid "Redirect URI"
-msgstr ""
+msgstr "éå®å URI"
#: mediagoblin/plugins/oauth/forms.py:55
msgid ""
"The redirect URI for the applications, this field\n"
" is required for public clients."
-msgstr ""
+msgstr "æ¤æç¨ç¨å¼çéå®å URIï¼æ¬æ¬ä½å¨å
¬éé¡åç OAuth client çºå¿
å¡«ã"
#: mediagoblin/plugins/oauth/forms.py:67
msgid "This field is required for public clients"
-msgstr ""
+msgstr "æ¬æ¬ä½å¨å
¬éé¡åç OAuth client çºå¿
å¡«"
#: mediagoblin/plugins/oauth/views.py:59
msgid "The client {0} has been registered!"
-msgstr ""
+msgstr "OAuth client {0} 註åå®æï¼"
#: mediagoblin/processing/__init__.py:138
msgid "Invalid file given for media type."
@@ -317,58 +322,39 @@ msgstr "æªæ¡"
#: mediagoblin/submit/views.py:57
msgid "You must provide a file."
-msgstr "ä½ å¿
é æä¾ä¸åæªæ¡"
+msgstr "æ¨å¿
é æä¾ä¸åæªæ¡"
#: mediagoblin/submit/views.py:164
msgid "Woohoo! Submitted!"
-msgstr "å¼å¼! éåºå»å!"
+msgstr "ååï¼PO ä¸å»å¦ï¼"
#: 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"
-
-#: mediagoblin/templates/mediagoblin/404.html:25
-msgid "Oops!"
-msgstr "ç³ç³ï¼"
-
-#: mediagoblin/templates/mediagoblin/404.html:26
-msgid "There doesn't seem to be a page at this address. Sorry!"
-msgstr "éåä½åä¼¼ä¹æ²æ網é ãæ±æï¼"
-
-#: 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."
-msgstr "å¦æä½ ç¢ºå®éåä½åæ¯æ£ç¢ºçï¼æè¨±ä½ å¨æ¾ç網é å·²ç¶è¢«ç§»é¤ææ¯åªé¤äºã"
+msgstr "èèã%sãæ°å¢å®æï¼"
#: mediagoblin/templates/mediagoblin/base.html:50
msgid "MediaGoblin logo"
msgstr "MediaGoblin æ¨èª"
-#: mediagoblin/templates/mediagoblin/base.html:60
-msgid "Verify your email!"
-msgstr "確èªä½ çé»åéµä»¶"
-
-#: mediagoblin/templates/mediagoblin/base.html:66
-msgid "+ Add media"
-msgstr "+ å å
¥åªé«"
+#: mediagoblin/templates/mediagoblin/base.html:56
+#, python-format
+msgid "%(user_name)s's account"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
-msgid "+ Add collection"
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:69
-msgid "View your profile"
-msgstr "檢è¦ä½ å人æªæ¡"
+#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+msgid "Add media"
+msgstr "æ°å¢åªé«"
#: mediagoblin/templates/mediagoblin/base.html:70
-msgid "Log out"
-msgstr "ç»åº"
+msgid "Verify your email!"
+msgstr "確èªæ¨çé»åéµä»¶"
#: mediagoblin/templates/mediagoblin/base.html:75
#: mediagoblin/templates/mediagoblin/auth/login.html:28
@@ -381,7 +367,7 @@ msgstr "ç»å
¥"
msgid ""
"Powered by MediaGoblin, a GNU project."
-msgstr "ç± MediaGoblin製ä½, å®æ¯ä¸å GNU å°æ¡"
+msgstr "åºæ¼ MediaGoblin â ä¸é
GNU å°æ¡ã"
#: mediagoblin/templates/mediagoblin/base.html:92
#, python-format
@@ -389,55 +375,73 @@ msgid ""
"Released under the AGPL. Source code available."
-msgstr "åºæ¼AGPLææ¬éåº. åå¾åå§ç¢¼."
+msgstr "以 AGPL ææ¬éåºãåæåå§ç¢¼ã"
+
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:25
+msgid "Actions"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:34
+msgid "Change account settings"
+msgstr "æ´æ¹å¸³èè¨å®"
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+#: mediagoblin/templates/mediagoblin/root.html:44
+#: 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 "åªé«èçé¢æ¿"
-#: mediagoblin/templates/mediagoblin/root.html:24
+#: mediagoblin/templates/mediagoblin/root.html:51
msgid "Explore"
msgstr "æ¢ç´¢"
-#: mediagoblin/templates/mediagoblin/root.html:26
+#: mediagoblin/templates/mediagoblin/root.html:53
msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "å¿ï¼æ¡è¿ä¾å° åªé«æªç¸(MediaGoblin) 網ç«"
+msgstr "å¿ï¼æ¡è¿ä¾å° MediaGoblin ç«å°ï¼ "
-#: mediagoblin/templates/mediagoblin/root.html:28
+#: mediagoblin/templates/mediagoblin/root.html:55
msgid ""
"This site is running MediaGoblin, an "
"extraordinarily great piece of media hosting software."
-msgstr "æ¤ç¶²ç«æ£éè¡ åªé«æªç¸(MediaGoblin), ä»æ¯ä¸åè¶
è®çåªé«å享æ¶ç«è»é«."
+msgstr "æ¬ç«ä½¿ç¨ MediaGoblin â èç¾ä¸åçåªé«å享網ç«ã"
-#: mediagoblin/templates/mediagoblin/root.html:29
+#: mediagoblin/templates/mediagoblin/root.html:56
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
-msgstr ""
+msgstr "æ¨å¯ä»¥ç»å
¥æ¨ç MediaGoblin 帳è以é²è¡ä¸å³åªé«ã張貼è©è«ççã"
-#: mediagoblin/templates/mediagoblin/root.html:31
+#: mediagoblin/templates/mediagoblin/root.html:58
msgid "Don't have one yet? It's easy!"
-msgstr "éæ²æåï¼å
¶å¯¦é常簡å®ï¼"
+msgstr "æ²æ帳èåï¼é帳èå¾ç°¡å®ï¼"
-#: mediagoblin/templates/mediagoblin/root.html:32
+#: mediagoblin/templates/mediagoblin/root.html:59
#, python-format
msgid ""
"Create an account at this site\n"
" or\n"
" Set up MediaGoblin on your own server"
-msgstr "å¨é網ç«å»ºç«å¸³è\n ææ¯\n å¨ä½ ç伺æå¨ä¸å»ºç«ä¸åèªå·±çåªé«æªç¸(MedaiGoblin)"
+msgstr "å¨éå網ç«ä¸å»ºç«å¸³è\n ææ¯\n å¨èªå·±ç伺æå¨ä¸å»ºç« MedaiGoblin"
-#: mediagoblin/templates/mediagoblin/root.html:40
+#: mediagoblin/templates/mediagoblin/root.html:67
msgid "Most recent media"
msgstr "ææ°çåªé«"
-#: 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 "åªé«èçé¢æ¿"
-
#: mediagoblin/templates/mediagoblin/admin/panel.html:29
msgid ""
"Here you can track the state of media being processed on this instance."
-msgstr ""
+msgstr "æ¤èæ¨å¯ä»¥è¿½è¹¤æ¬ç«å°èçåªé«ççæ
ã"
#: mediagoblin/templates/mediagoblin/admin/panel.html:32
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
@@ -452,26 +456,26 @@ msgstr "æ²ææ£å¨èçä¸çåªé«"
#: mediagoblin/templates/mediagoblin/admin/panel.html:61
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59
msgid "These uploads failed to process:"
-msgstr "ç¡æ³èçéäºæ´æ°"
+msgstr "ç¡æ³èçéäºä¸å³å
§å®¹ï¼"
#: mediagoblin/templates/mediagoblin/admin/panel.html:90
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
msgid "No failed entries!"
-msgstr ""
+msgstr "æ²æ失æçç´éï¼"
#: mediagoblin/templates/mediagoblin/admin/panel.html:92
msgid "Last 10 successful uploads"
-msgstr ""
+msgstr "æè¿ 10 次æåä¸å³çç´é"
#: mediagoblin/templates/mediagoblin/admin/panel.html:112
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
msgid "No processed entries, yet!"
-msgstr ""
+msgstr "ç¾å¨éæ²æèççç´éï¼"
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
-msgstr "è¨å®ä½ çæ°å¯ç¢¼"
+msgstr "è¨å®æ¨çæ°å¯ç¢¼"
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39
msgid "Set password"
@@ -498,7 +502,7 @@ msgid ""
"\n"
"If you think this is an error, just ignore this email and continue being\n"
"a happy goblin!"
-msgstr "å¨ %(username)s,\n\nè¦æ´æ¹ GNU MediaGoblinçå¯ç¢¼ï¼å¨ç覽å¨ä¸æéä¸é¢ç網å:\n\n%(verification_url)s\n\nå¦æä½ èªçºéåæ¯å誤æï¼è«å¿½ç¥æ¤å°ä¿¡ä»¶ï¼ç¹¼çºç¶åå¿«æ¨çgoblin!"
+msgstr "%(username)s æ¨å¥½ï¼\n\nè¦ä¿®æ¹ GNU MediaGoblin çå¯ç¢¼ï¼è«å¨æ¨çç覽å¨ä¸æéä¸é¢ç網åï¼\n\n%(verification_url)s\n\nå¦ææ¨èªçºéåæ¯å誤æï¼è«å¿½ç¥æ¤å°ä¿¡ä»¶ï¼ç¹¼çºç¶åå¿«æ¨çå¥å¸æï¼"
#: mediagoblin/templates/mediagoblin/auth/login.html:39
msgid "Logging in failed!"
@@ -506,11 +510,11 @@ msgstr "ç»å
¥å¤±æï¼"
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
-msgstr "éæ²æ帳èå?"
+msgstr "éæ²æ帳èåï¼"
#: mediagoblin/templates/mediagoblin/auth/login.html:45
msgid "Create one here!"
-msgstr "å¨é裡建ç«ä¸åå§!"
+msgstr "å¨é裡建ç«ä¸åå§ï¼"
#: mediagoblin/templates/mediagoblin/auth/login.html:51
msgid "Forgot your password?"
@@ -519,7 +523,7 @@ msgstr "å¿äºå¯ç¢¼åï¼"
#: mediagoblin/templates/mediagoblin/auth/register.html:28
#: mediagoblin/templates/mediagoblin/auth/register.html:36
msgid "Create an account!"
-msgstr "建ç«ä¸å帳è!"
+msgstr "建ç«ä¸å帳èï¼"
#: mediagoblin/templates/mediagoblin/auth/register.html:40
msgid "Create"
@@ -534,52 +538,65 @@ msgid ""
"your web browser:\n"
"\n"
"%(verification_url)s"
-msgstr "å¨ %(username)s,\n\nåå GNU MediaGoblin 帳è, å¨ä½ çç覽å¨ä¸æéä¸é¢ç網å:\n\n%(verification_url)s"
+msgstr "%(username)s æ¨å¥½ï¼\n\nè¦åå GNU MediaGoblin 帳èï¼è«å¨æ¨çç覽å¨ä¸æéä¸é¢ç網å:\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 "編輯 %(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 "編輯 %(media_title)s ä¸"
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+msgid "Attachments"
+msgstr "é件"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+msgid "Add attachment"
+msgstr "æ°å¢é件"
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
#: 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
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
msgid "Cancel"
msgstr "åæ¶"
-#: mediagoblin/templates/mediagoblin/edit/edit.html:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
msgid "Save changes"
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"
+
#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
msgid "Changing %(username)s's account settings"
-msgstr "æ£å¨æ¹è® %(username)sç帳èè¨å®"
+msgstr "æ£å¨æ¹è® %(username)s ç帳èè¨å®"
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
-msgstr ""
+msgstr "編輯 %(collection_title)s"
#: 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'çæªæ¡ä¸"
+msgstr "編輯 %(username)s çå人æªæ¡"
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
@@ -587,85 +604,83 @@ msgstr "編輯 %(username)s'çæªæ¡ä¸"
#: mediagoblin/templates/mediagoblin/listings/tag.html:35
#, python-format
msgid "Media tagged with: %(tag_name)s"
-msgstr "æ¤åªé«è¢«æ¨èçºï¼%(tag_name)s"
+msgstr "æ¤åªé«è¢« tag æï¼%(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 "ä¸è¼"
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:27
msgid "Original"
-msgstr "åå§ç"
+msgstr "åå§æª"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
msgid ""
"Sorry, this audio will not work because \n"
"\tyour web browser does not support HTML5 \n"
"\taudio."
-msgstr "æ±æï¼æ¤è²é³æªæ¡ç¡æ³ææ¾ï¼å çºä½ çç覽å¨ä¸æ¯æ´HTML5é³è¨ã"
+msgstr "æ±æï¼æ¤è²é³ç¡æ³ææ¾ï¼å çºæ¨çç覽å¨ä¸æ¯æ´ HTML5 é³è¨ã"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
msgid ""
"You can get a modern web browser that \n"
"\tcan play the audio at \n"
"\t http://getfirefox.com!"
-msgstr "ä½ å¯ä»¥å¨æ¤åå¾å¯ä»¥ææ¾é³æ¨ççè¦½å¨ \n\t http://getfirefox.com!"
+msgstr "æ¨å¯ä»¥å¨ http://getfirefox.com åå¾å¯ä»¥ææ¾æ¤è²é³çç覽å¨ï¼"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
#: mediagoblin/templates/mediagoblin/media_displays/video.html:56
msgid "Original file"
-msgstr ""
+msgstr "åå§æªæ¡"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
msgid "WebM file (Vorbis codec)"
-msgstr "WebM æªæ¡ (Vorbis codec)"
+msgstr "WebM æªæ¡ (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 "æ±æ, æ¤å½±çç¡æ³ä½¿ç¨ï¼å çº \n» ä½ çç覽å¨ä¸æ¯æ´ HTML5 \n» çå½±ç."
+msgstr "æ±æï¼æ¤å½±çç¡æ³ä½¿ç¨ï¼å çºæ¨çç覽å¨ä¸æ¯æ´ HTML5 çå½±ç."
#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
msgid ""
"You can get a modern web browser that \n"
"\t can play this video at \n"
"\t http://getfirefox.com!"
-msgstr "ä½ å¯ä»¥åå¾\n» ææ¾é樣æªæ¡çææ°çè¦½å¨ \n» http://getfirefox.com!"
+msgstr "æ¨å¯ä»¥å¨ http://getfirefox.com åå¾å¯ä»¥ææ¾æ¤å½±ççç覽å¨ï¼"
#: mediagoblin/templates/mediagoblin/media_displays/video.html:59
msgid "WebM file (640p; VP8/Vorbis)"
-msgstr ""
+msgstr "WebM æªæ¡ (640p; VP8/Vorbis)"
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
-msgstr ""
+msgstr "æ°å¢èè"
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
msgid "Add"
msgstr "å¢å "
#: mediagoblin/templates/mediagoblin/submit/start.html:23
#: mediagoblin/templates/mediagoblin/submit/start.html:30
msgid "Add your media"
-msgstr "å å
¥ä½ çåªé«"
+msgstr "å å
¥æ¨çåªé«"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
#, python-format
msgid "%(collection_title)s (%(username)s's collection)"
-msgstr ""
+msgstr "%(collection_title)s (%(username)s çèè)"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
#, python-format
msgid "%(collection_title)s by %(username)s"
-msgstr ""
+msgstr "%(collection_title)s by %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
@@ -683,7 +698,7 @@ msgid ""
"\n"
" %(collection_description)s\n"
"
"
-msgstr ""
+msgstr "\n %(collection_description)s\n
"
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -692,25 +707,25 @@ 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
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
-msgstr "æ°¸é åªé¤"
+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 ""
+msgstr "確å®è¦å¾ %(collection_title)s ç§»é¤ %(media_title)s åï¼"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
msgid "Remove"
-msgstr ""
+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 "%(username)s æ¨å¥½ï¼\n%(comment_author)s å¨ %(instance_name)s å°æ¨çå
§å®¹ (%(comment_url)s) 張貼è©è«\n"
#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
#, python-format
@@ -720,18 +735,18 @@ msgstr "%(username)sçåªé«"
#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37
#, python-format
msgid "%(username)s's media"
-msgstr "%(username)sçåªé«æªæ¡"
+msgstr "%(username)s çåªé«"
#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
#, python-format
msgid "â Browsing media by %(username)s"
-msgstr "â ç± %(username)sç覽åªé«æªæ¡"
+msgstr "â ç覽 %(username)s çåªé«"
#: mediagoblin/templates/mediagoblin/user_pages/media.html:67
#: mediagoblin/templates/mediagoblin/user_pages/media.html:73
#, python-format
msgid "Image for %(media_title)s"
-msgstr " %(media_title)sçç
§ç"
+msgstr " %(media_title)s çç
§ç"
#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
msgid "Add a comment"
@@ -742,11 +757,11 @@ msgid ""
"You can use Markdown for"
" formatting."
-msgstr "ä½ å¯ä»¥ç¨ Markdown ä¾æç."
+msgstr "æ¨å¯ä»¥ç¨ Markdown ä¾æçã"
#: mediagoblin/templates/mediagoblin/user_pages/media.html:113
msgid "Add this comment"
-msgstr "å¢å æ¤è©è«"
+msgstr "å¢å è©è«"
#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
msgid "at"
@@ -759,46 +774,41 @@ msgid ""
" %(date)s
"
msgstr "å å
¥æ¥æ
\n %(date)s
"
-#: 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:192
-msgid "Add attachment"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
+msgid "Add media to collection"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
#, python-format
msgid "Add %(title)s to collection"
-msgstr ""
+msgstr "æ°å¢ %(title)s å°èè"
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
msgid "+"
-msgstr ""
+msgstr "+"
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
msgid "Add a new collection"
-msgstr ""
+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 "éå°ä½ çå±ç¤ºåï¼ä½ å¯ä»¥å¨é裡追蹤åªé«èçççæ
ã"
+msgstr "æ¨å¯ä»¥å¨é裡追蹤æ¨çèå»ä¸åªé«èçççæ
ã"
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
msgid "Your last 10 successful uploads"
-msgstr ""
+msgstr "æ¨çæè¿ 10 次æåä¸å³çç´é"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:31
#: mediagoblin/templates/mediagoblin/user_pages/user.html:89
#, python-format
msgid "%(username)s's profile"
-msgstr "%(username)sçå人æªæ¡"
+msgstr "%(username)s çå人æªæ¡"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:43
msgid "Sorry, no such user found."
-msgstr "æ±æï¼æ¾ä¸å°éå使ç¨è
."
+msgstr "æ±æï¼æ¾ä¸å°éå使ç¨è
ã"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:50
#: mediagoblin/templates/mediagoblin/user_pages/user.html:70
@@ -807,16 +817,16 @@ msgstr "éè¦èªèé»åéµä»¶"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:53
msgid "Almost done! Your account still needs to be activated."
-msgstr "å¹¾ä¹å®æäºï¼ä½ä½ ç帳èä»ç¶éè¦è¢«åç¨ã"
+msgstr "å¿«å®æäºï¼ä½æ¨éè¦åç¨æ¨ç帳èã"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:58
msgid ""
"An email should arrive in a few moments with instructions on how to do so."
-msgstr "馬ä¸ææä¸å°é»åéµä»¶åè¨´ä½ å¦ä½å."
+msgstr "åç¨æ¥é©ç email å°æå¯å°æ¨çä¿¡ç®±ã"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:62
msgid "In case it doesn't:"
-msgstr "å¦æä»ç¶ç¡æ³èªèï¼ä½ å¯ä»¥:"
+msgstr "å¦æä»ç¶ç¡æ³èªèï¼æ¨å¯ä»¥ï¼"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:65
msgid "Resend verification email"
@@ -826,18 +836,18 @@ msgstr "ééèªèä¿¡"
msgid ""
"Someone has registered an account with this username, but it still has to be"
" activated."
-msgstr "æ人ç¨äºéå帳èç»éäºï¼ä½æ¯éå帳èä»éè¦è¢«åç¨ã"
+msgstr "æ人ç¨äºéå帳èç»éäºï¼ä½æ¯éå帳èéè¦è¢«åç¨ã"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:79
#, python-format
msgid ""
"If you are that person but you've lost your verification email, you can log in and resend it."
-msgstr "å¦æä½ å°±æ¯é£å人, ä½æ¯éºå¤±äºèªèä¿¡, ä½ å¯ä»¥ç»å
¥ ç¶å¾ééä¸æ¬¡."
+msgstr "å¦ææ¨å°±æ¯æ¬äººä½æ¯æäºèªèä¿¡ï¼æ¨å¯ä»¥ ç»å
¥ ç¶å¾ééä¸æ¬¡ã"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:96
msgid "Here's a spot to tell others about yourself."
-msgstr "éåå°æ¹è½è®ä½ åä»äººä»ç´¹èªå·±ã"
+msgstr "éåå°æ¹è½è®æ¨åä»äººä»ç´¹èªå·±ã"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:101
#: mediagoblin/templates/mediagoblin/user_pages/user.html:118
@@ -846,53 +856,37 @@ msgstr "編輯å人æªæ¡"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:106
msgid "This user hasn't filled in their profile (yet)."
-msgstr "éå使ç¨è
éæ²(ä¾å¾å)填寫å人æªæ¡ã"
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
-msgid "Change account settings"
-msgstr "æ´æ¹å¸³èè¨å®"
+msgstr "éå使ç¨è
(é)æ²æ填寫å人æªæ¡ã"
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
#, python-format
msgid "View all of %(username)s's media"
-msgstr "æ¥ç%(username)sçå
¨é¨åªé«æªæ¡"
+msgstr "æ¥ç %(username)s çå
¨é¨åªé«"
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
-msgstr "éåå°æ¹æ¯ä½ çåªé«æªæ¡æåºç¾çå°æ¹ï¼ä½æ¯ä½ ä¼¼ä¹éæ²æå å
¥ä»»ä½æ±è¥¿ã"
+msgstr "æ¤èæ¯æ¨çåªé«æåºç¾çå°æ¹ï¼ä½æ¯ä¼¼ä¹éæ²æå å
¥ä»»ä½æ±è¥¿ã"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
-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
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
msgid "There doesn't seem to be any media here yet..."
-msgstr "ä¼¼ä¹éæ²æä»»ä½çåªé«æªæ¡..."
+msgstr "é£è£¡å¥½åéæ²æä»»ä½çåªé«â¦"
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39
-#, python-format
-msgid ""
-"
\n"
-" %(note)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47
-#, python-format
-msgid "
(remove)"
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51
+msgid "(remove)"
msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:20
#, python-format
msgid "In collections (%(collected)s)"
-msgstr ""
+msgstr "å¨èè (%(collected)s)"
#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
msgid "feed icon"
-msgstr "feedå示"
+msgstr "feed å示"
#: mediagoblin/templates/mediagoblin/utils/feed_link.html:23
msgid "Atom feed"
@@ -902,10 +896,10 @@ msgstr "Atom feed"
msgid "Location"
msgstr "ä½ç½®"
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
#, python-format
msgid "View on OpenStreetMap"
-msgstr "å¨ OpenStreetMapä¸è§ç"
+msgstr "å¨ OpenStreetMap ä¸è§ç"
#: mediagoblin/templates/mediagoblin/utils/license.html:25
msgid "All rights reserved"
@@ -913,11 +907,11 @@ msgstr "çæ¬ææ"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:39
msgid "â Newer"
-msgstr "â æ´æ°"
+msgstr "â æ´æ°ç"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:45
msgid "Older â"
-msgstr "æ´è â"
+msgstr "æ´èç â"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:48
msgid "Go to page:"
@@ -926,109 +920,135 @@ msgstr "è·³å°é æ¸ï¼"
#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
msgid "newer"
-msgstr "æ´æ°"
+msgstr "æ´æ°ç"
#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
msgid "older"
-msgstr "æ´è"
+msgstr "æ´èç"
#: mediagoblin/templates/mediagoblin/utils/tags.html:20
msgid "Tagged with"
-msgstr "æ¨ç±¤çº"
+msgstr "æ¨ç±¤"
#: mediagoblin/tools/exif.py:78
msgid "Could not read the image file."
-msgstr "ç¡æ³è®åå½±åæªæ¡ã"
+msgstr "ç¡æ³è®ååçæªæ¡ã"
+
+#: mediagoblin/tools/response.py:29
+msgid "Oops!"
+msgstr "ç³ç³ï¼"
+
+#: mediagoblin/tools/response.py:30
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:44
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:45
+msgid ""
+"Sorry Dave, I can't let you do that!
You have tried to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:52
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!
If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
#: mediagoblin/user_pages/forms.py:28
msgid "I am sure I want to delete this"
-msgstr "æ確å®ææ³è¦åªé¤"
+msgstr "æ確å®æè¦åªé¤éååªé«"
#: mediagoblin/user_pages/forms.py:32
msgid "I am sure I want to remove this item from the collection"
-msgstr ""
+msgstr "æ確å®æè¦å¾èèä¸ç§»é¤æ¤é
ç®"
#: mediagoblin/user_pages/forms.py:35
msgid "-- Select --"
-msgstr ""
+msgstr "â è«é¸æ â"
#: mediagoblin/user_pages/forms.py:37
msgid "Include a note"
-msgstr ""
+msgstr "å 註"
#: mediagoblin/user_pages/lib.py:56
msgid "commented on your post"
-msgstr ""
+msgstr "å¨æ¨çå
§å®¹å¼µè²¼è©è«"
#: mediagoblin/user_pages/views.py:161
msgid "Oops, your comment was empty."
-msgstr "åï¼ä½ ççè¨æ¯ç©ºçã"
+msgstr "åï¼æ¨ççè¨æ¯ç©ºçã"
#: mediagoblin/user_pages/views.py:167
msgid "Your comment has been posted!"
-msgstr "ä½ ççè¨å·²ç¶åç»ï¼"
+msgstr "æ¨ççè¨å·²ç¶å¼µè²¼å®æï¼"
#: mediagoblin/user_pages/views.py:235
msgid "You have to select or add a collection"
-msgstr ""
+msgstr "æ¨éè¦é¸æææ¯æ°å¢ä¸åèè"
#: mediagoblin/user_pages/views.py:243
#, python-format
msgid "\"%s\" already in collection \"%s\""
-msgstr ""
+msgstr "ã%sãå·²ç¶å¨ã%sãèè"
#: mediagoblin/user_pages/views.py:258
#, python-format
msgid "\"%s\" added to collection \"%s\""
-msgstr ""
+msgstr "ã%sãå å
¥ã%sãèè"
#: mediagoblin/user_pages/views.py:266
msgid "Please check your entries and try again."
-msgstr ""
+msgstr "è«æª¢æ¥é
ç®ä¸¦é試ã"
#: mediagoblin/user_pages/views.py:297
msgid ""
"Some of the files with this entry seem to be missing. Deleting anyway."
-msgstr ""
+msgstr "å¨æ¤é
ç®ä¸æäºæªæ¡å¥½åä¸è¦äºï¼å·²å
è¡åªé¤ã"
#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
-msgstr "ä½ å·²åªé¤æ¤åªé«æªæ¡ã"
+msgstr "æ¨å·²ç¶åªé¤æ¤åªé«ã"
#: mediagoblin/user_pages/views.py:309
msgid "The media was not deleted because you didn't check that you were sure."
-msgstr "æ¤åªé«æªæ¡å°æªè¢«åªé¤å çºä½ éæ²æ確èªä½ ççè¦åªé¤ã"
+msgstr "ç±æ¼æ¨æ²æå¾é¸ç¢ºèªï¼è©²åªé«æ²æ被移é¤ã"
#: mediagoblin/user_pages/views.py:317
msgid "You are about to delete another user's media. Proceed with caution."
-msgstr "ä½ å¨åªé¤å
¶ä»äººçåªé«æªæ¡ãè«å°å¿èçåã"
+msgstr "æ¨æ£å¨åªé¤å¥äººçåªé«ï¼è«å°å¿æä½ã"
#: mediagoblin/user_pages/views.py:379
msgid "You deleted the item from the collection."
-msgstr ""
+msgstr "æ¨å·²ç¶å¾è©²èèä¸åªé¤è©²é
ç®ã"
#: mediagoblin/user_pages/views.py:383
msgid "The item was not removed because you didn't check that you were sure."
-msgstr ""
+msgstr "ç±æ¼æ¨æ²æå¾é¸ç¢ºèªï¼è©²é
ç®æ²æ被移é¤ã"
#: mediagoblin/user_pages/views.py:393
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
-msgstr ""
+msgstr "æ¨æ£å¨å¾å¥äººçèèä¸åªé¤é
ç®ï¼è«å°å¿æä½ã"
#: mediagoblin/user_pages/views.py:426
#, python-format
msgid "You deleted the collection \"%s\""
-msgstr ""
+msgstr "æ¨å·²ç¶åªé¤ã%sãèèã"
#: mediagoblin/user_pages/views.py:433
msgid ""
"The collection was not deleted because you didn't check that you were sure."
-msgstr ""
+msgstr "ç±æ¼æ¨æ²æå¾é¸ç¢ºèªï¼è©²èèæ²æ被移é¤ã"
#: mediagoblin/user_pages/views.py:443
msgid ""
"You are about to delete another user's collection. Proceed with caution."
-msgstr ""
+msgstr "æ¨æ£å¨åªé¤å¥äººçèèï¼è«å°å¿æä½ã"