From 567c09f02ce1a88ffee462116d6603501b50e5a1 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber
Date: Mon, 26 Aug 2013 14:19:44 -0500
Subject: [PATCH] Committing extracted and compiled translations
---
.../i18n/ar/LC_MESSAGES/mediagoblin.mo | Bin 28177 -> 34293 bytes
.../i18n/ar/LC_MESSAGES/mediagoblin.po | 693 +++++++++++-----
.../i18n/bg/LC_MESSAGES/mediagoblin.mo | Bin 0 -> 24290 bytes
.../i18n/ca/LC_MESSAGES/mediagoblin.mo | Bin 25199 -> 31346 bytes
.../i18n/ca/LC_MESSAGES/mediagoblin.po | 691 +++++++++++-----
.../i18n/da/LC_MESSAGES/mediagoblin.mo | Bin 24330 -> 30478 bytes
.../i18n/da/LC_MESSAGES/mediagoblin.po | 685 +++++++++++-----
.../i18n/de/LC_MESSAGES/mediagoblin.mo | Bin 25811 -> 31927 bytes
.../i18n/de/LC_MESSAGES/mediagoblin.po | 703 ++++++++++++-----
.../i18n/en/LC_MESSAGES/mediagoblin.po | 678 +++++++++++-----
.../i18n/eo/LC_MESSAGES/mediagoblin.mo | Bin 25211 -> 31336 bytes
.../i18n/eo/LC_MESSAGES/mediagoblin.po | 701 ++++++++++++-----
.../i18n/es/LC_MESSAGES/mediagoblin.mo | Bin 25994 -> 32134 bytes
.../i18n/es/LC_MESSAGES/mediagoblin.po | 703 ++++++++++++-----
.../i18n/fa/LC_MESSAGES/mediagoblin.mo | Bin 25146 -> 31294 bytes
.../i18n/fa/LC_MESSAGES/mediagoblin.po | 683 +++++++++++-----
.../i18n/fr/LC_MESSAGES/mediagoblin.mo | Bin 26152 -> 32279 bytes
.../i18n/fr/LC_MESSAGES/mediagoblin.po | 691 +++++++++++-----
.../i18n/he/LC_MESSAGES/mediagoblin.mo | Bin 27529 -> 33619 bytes
.../i18n/he/LC_MESSAGES/mediagoblin.po | 703 ++++++++++++-----
.../i18n/ia/LC_MESSAGES/mediagoblin.mo | Bin 24326 -> 30474 bytes
.../i18n/ia/LC_MESSAGES/mediagoblin.po | 685 +++++++++++-----
.../i18n/is_IS/LC_MESSAGES/mediagoblin.mo | Bin 26342 -> 32482 bytes
.../i18n/is_IS/LC_MESSAGES/mediagoblin.po | 737 +++++++++++++-----
.../i18n/it/LC_MESSAGES/mediagoblin.mo | Bin 25279 -> 31419 bytes
.../i18n/it/LC_MESSAGES/mediagoblin.po | 691 +++++++++++-----
.../i18n/ja/LC_MESSAGES/mediagoblin.mo | Bin 24944 -> 31092 bytes
.../i18n/ja/LC_MESSAGES/mediagoblin.po | 683 +++++++++++-----
.../i18n/ko_KR/LC_MESSAGES/mediagoblin.mo | Bin 26202 -> 32323 bytes
.../i18n/ko_KR/LC_MESSAGES/mediagoblin.po | 691 +++++++++++-----
.../i18n/nl/LC_MESSAGES/mediagoblin.mo | Bin 24753 -> 30887 bytes
.../i18n/nl/LC_MESSAGES/mediagoblin.po | 685 +++++++++++-----
.../i18n/nn_NO/LC_MESSAGES/mediagoblin.mo | Bin 23771 -> 29907 bytes
.../i18n/nn_NO/LC_MESSAGES/mediagoblin.po | 703 ++++++++++++-----
.../i18n/pl/LC_MESSAGES/mediagoblin.mo | Bin 25584 -> 31701 bytes
.../i18n/pl/LC_MESSAGES/mediagoblin.po | 705 ++++++++++++-----
.../i18n/pt_BR/LC_MESSAGES/mediagoblin.mo | Bin 25166 -> 31334 bytes
.../i18n/pt_BR/LC_MESSAGES/mediagoblin.po | 695 ++++++++++++-----
.../i18n/ro/LC_MESSAGES/mediagoblin.mo | Bin 25911 -> 32063 bytes
.../i18n/ro/LC_MESSAGES/mediagoblin.po | 703 ++++++++++++-----
.../i18n/ru/LC_MESSAGES/mediagoblin.mo | Bin 32200 -> 38290 bytes
.../i18n/ru/LC_MESSAGES/mediagoblin.po | 701 ++++++++++++-----
.../i18n/sk/LC_MESSAGES/mediagoblin.mo | Bin 25686 -> 31797 bytes
.../i18n/sk/LC_MESSAGES/mediagoblin.po | 709 ++++++++++++-----
.../i18n/sl/LC_MESSAGES/mediagoblin.mo | Bin 24504 -> 30652 bytes
.../i18n/sl/LC_MESSAGES/mediagoblin.po | 683 +++++++++++-----
.../i18n/sq/LC_MESSAGES/mediagoblin.mo | Bin 25789 -> 31904 bytes
.../i18n/sq/LC_MESSAGES/mediagoblin.po | 693 +++++++++++-----
.../i18n/sr/LC_MESSAGES/mediagoblin.mo | Bin 24362 -> 30510 bytes
.../i18n/sr/LC_MESSAGES/mediagoblin.po | 681 +++++++++++-----
.../i18n/sv/LC_MESSAGES/mediagoblin.mo | Bin 24592 -> 30740 bytes
.../i18n/sv/LC_MESSAGES/mediagoblin.po | 683 +++++++++++-----
.../i18n/te/LC_MESSAGES/mediagoblin.mo | Bin 24563 -> 30711 bytes
.../i18n/te/LC_MESSAGES/mediagoblin.po | 685 +++++++++++-----
.../i18n/tr_TR/LC_MESSAGES/mediagoblin.mo | Bin 24771 -> 30906 bytes
.../i18n/tr_TR/LC_MESSAGES/mediagoblin.po | 695 ++++++++++++-----
.../i18n/vi/LC_MESSAGES/mediagoblin.mo | Bin 0 -> 30432 bytes
.../i18n/vi/LC_MESSAGES/mediagoblin.po | 673 +++++++++++-----
.../i18n/vi_VN/LC_MESSAGES/mediagoblin.mo | Bin 0 -> 24298 bytes
.../i18n/zh_CN/LC_MESSAGES/mediagoblin.mo | Bin 23615 -> 29782 bytes
.../i18n/zh_CN/LC_MESSAGES/mediagoblin.po | 705 ++++++++++++-----
.../zh_TW.Big5/LC_MESSAGES/mediagoblin.mo | Bin 24306 -> 30454 bytes
.../zh_TW.Big5/LC_MESSAGES/mediagoblin.po | 681 +++++++++++-----
.../i18n/zh_TW/LC_MESSAGES/mediagoblin.mo | Bin 23703 -> 29880 bytes
.../i18n/zh_TW/LC_MESSAGES/mediagoblin.po | 703 ++++++++++++-----
65 files changed, 16015 insertions(+), 6186 deletions(-)
create mode 100644 mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.mo
create mode 100644 mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.mo
create mode 100644 mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.mo
diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo
index 543830c8c1b9be63d23cdf7d4d45a27fe32b9e0d..442c84e548ace3ba7ca759dc17cb1d96808f33e8 100644
GIT binary patch
delta 10402
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
diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po
index 1f086613..03fb88e2 100644
--- a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-05-27 13:54-0500\n"
-"PO-Revision-Date: 2013-05-27 18:54+0000\n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/mediagoblin/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -23,250 +23,280 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "اسÙ
اÙÙ
ستخدÙ
"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "ÙÙÙ
Ø© Ø§ÙØ³Ø±"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "عÙÙØ§Ù Ø§ÙØ¨Ø±Ùد Ø§ÙØ¥ÙÙØªØ±ÙÙÙ"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "عÙÙÙØ§Ø Ø§ÙØªØ³Ø¬ÙÙ ØºÙØ± Ù
ØªØ§Ø ÙÙØ§."
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr "اسÙ
اÙÙ
ستخدÙ
Ø§Ù Ø§ÙØ§ÙÙ
ÙÙ"
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr "اسÙ
Ù
ستخدÙ
ا٠اÙÙ
ÙÙ ØºÙØ± صØÙØ."
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr "ÙØ°Ø§ Ø§ÙØÙÙ ÙØ§ ÙØ£Ø®Ø° اÙÙ
ÙÙ."
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr "ÙØ°Ø§ Ø§ÙØÙÙ ÙØØªØ§Ø¬ اÙÙ
ÙÙ."
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "عÙÙÙØ§Ø Ø§ÙØªØ³Ø¬ÙÙ ØºÙØ± Ù
ØªØ§Ø ÙÙØ§."
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "Ø¹Ø°Ø±ÙØ§Ø ÙÙØ¯ اختار Ù
ستخدÙ
آخر ÙØ°Ø§ Ø§ÙØ§Ø³Ù
."
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr "Ø¹Ø°Ø±ÙØ§Ø ÙÙØ¯ اختار Ù
ستخدÙ
آخر ÙØ°Ø§ Ø§ÙØ§ÙÙ
ÙÙ."
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "تÙ
Ø§ÙØªØÙÙ Ù
Ù Ø¨Ø±ÙØ¯Ù Ø§ÙØ¥ÙÙØªØ±ÙÙÙ. ÙÙ
ÙÙÙ Ø§ÙØ¢Ù اÙÙÙÙØ¬Ø ÙØªØØ±Ùر Ù
ÙÙÙ Ø§ÙØ´Ø®ØµÙØ ÙÙØ´Ø± Ø§ÙØµÙر!"
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "Ù
ÙØªØ§Ø Ø§ÙØªØÙ٠أ٠Ù
عر٠اÙÙ
ستخدÙ
خاطئ"
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr "ÙØ¬Ø¨ عÙÙ٠تسجÙÙ Ø§ÙØ¯Ø®ÙÙ ÙØ¥Ø±Ø³Ø§Ù Ø¨Ø±ÙØ¯ اÙÙØªØ±ÙÙÙ ÙÙ!"
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr "ÙÙØ¯ ÙÙ
ت باÙÙØ¹Ù Ø¨Ø§ÙØªØÙÙ Ù
٠عÙÙØ§Ù Ø§ÙØ¨Ø±Ùد Ø§ÙØ¥ÙÙØªØ±ÙÙÙ Ø§ÙØ®Ø§Øµ بÙ!"
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "Ø£Ø¹Ø¯ÙØ§ Ø¥Ø±Ø³Ø§Ù Ø±Ø³Ø§ÙØ© Ø§ÙØªØÙÙ."
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr "إذا ÙØ§Ù ÙØ°Ø§ Ø§ÙØ§ÙÙ
ÙÙ(ØØ³Ø§Ø³ ÙÙØØ±Ù٠اÙÙØ¨Ùرة ÙØ§ÙØµØºÙØ±Ø©!) Ù
ÙØ³Ø¬Ù, ÙÙØ¯ تÙ
إرسا٠اÙÙ
Ù٠ب٠تعÙÙÙ
ات ع٠ÙÙÙÙØ© تغÙÙØ± رÙÙ
Ù Ø§ÙØ³Ø±Ù."
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr "ÙÙ
ÙØªÙ
ÙÙ Ù
Ù Ø§ÙØ¹Ø«Ùر عÙÙ Ø£ØØ¯ Ù٠أسÙ
اÙÙ
ستخدÙ
ÙØ°Ø§."
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "ÙÙØ¯ تÙ
إرسا٠اÙÙ
Ù٠ب٠تعÙÙÙ
ات ع٠ÙÙÙÙØ© تغÙÙØ± رÙÙ
Ù Ø§ÙØ³Ø±Ù."
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr "تعذر Ø¥Ø±Ø³Ø§Ù Ø±Ø³Ø§ÙØ© استعادة ÙÙÙ
Ø© Ø§ÙØ³Ø± ÙØ£Ù اسÙ
اÙÙ
ستخدÙ
Ù
Ø¹Ø·Ù Ø£Ù ÙØ£ÙÙØ§ ÙÙ
ÙØªØÙÙ Ù
Ù Ø¨Ø±ÙØ¯Ù Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
msgid "You can now log in using your new password."
msgstr "ØªØ³ØªØ·ÙØ¹ Ø§ÙØ¢Ù Ø§ÙØ¯Ø®Ù٠باستخداÙ
رÙÙ
Ù Ø§ÙØ³Ø±Ù Ø§ÙØ¬Ø¯Ùد."
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "Ø§ÙØ¹ÙÙØ§Ù"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr "ÙØµÙ ÙØ°Ø§ Ø§ÙØ¹Ù
Ù."
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr "باÙ
ÙØ§Ù٠استخداÙ
â\nâ\nMarkdown ÙÙØ¥Ø¯Ø±Ø§Ø¬."
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "اÙÙØ³ÙÙ
"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr "ÙÙ
Ø¨ÙØµÙ اÙÙ
ØØ¯Ø¯Ø§Øª Ø¨ÙØµÙØ©."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr "اÙÙ
سار"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr "ÙØ§ ÙÙ
Ù٠تر٠اÙÙ
سار ÙØ§Ø±ØºÙا"
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr "Ù
ÙØ¯Ù
Ø© عÙÙØ§Ù ÙØ°Ù اÙÙ
ÙØ¯Ùا, ØºØ§ÙØ¨Ø§ ÙÙ ØªØØªØ§Ø¬ ÙØªØºÙرÙ."
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr "ØªØ±Ø®ÙØµ"
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr "Ø§ÙØ³Ùرة"
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "اÙÙ
ÙÙØ¹ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr "Ø§ÙØ¹ÙÙØ§Ù ÙØØªÙ٠عÙ٠اخطاء"
-#: mediagoblin/edit/forms.py:63
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr "ارس٠ÙÙ Ø±Ø³Ø§ÙØ© Ø¹ÙØ¯Ù
ا ÙÙÙÙ
Ø§ÙØ§Ø®Ø±ÙÙ Ø¨Ø§ÙØªØ¹ÙÙ٠عÙ٠اÙÙ
ÙØ¯Ùا خاصتÙ"
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:69
msgid "License preference"
msgstr "ØªÙØ¶Ù٠رخصة"
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:75
msgid "This will be your default license on upload forms."
msgstr "سÙ٠تÙÙÙ ÙØ°Ù رخصت٠اÙÙ
Ø¨Ø¯Ø¦ÙØ© ÙÙ ÙÙ
اذج Ø§ÙØªØÙ
ÙÙ."
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
-msgstr "ارس٠ÙÙ Ø±Ø³Ø§ÙØ© Ø¹ÙØ¯Ù
ا ÙÙÙÙ
Ø§ÙØ§Ø®Ø±ÙÙ Ø¨Ø§ÙØªØ¹ÙÙ٠عÙ٠اÙÙ
ÙØ¯Ùا خاصتÙ"
-
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr "ÙØ§ ÙÙ
ÙÙ ØªØ±Ù Ø§ÙØ¹ÙÙØ§Ù ÙØ§Ø±ØºÙا"
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "ÙØµÙ ÙØ°Ù اÙÙ
جÙ
ÙØ¹Ø©"
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr "Ù
ÙØ¯Ù
Ø© عÙÙØ§Ù ÙØ°Ù اÙÙ
جÙ
ÙØ¹Ø©, ØºØ§ÙØ¨Ø§ ÙÙ ØªØØªØ§Ø¬ ÙØªØºÙرÙ."
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr " ÙÙÙ
Ø© Ø§ÙØ³Ø± اÙÙØ¯ÙÙ
Ø©"
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr "ÙÙ
بإدخا٠رÙÙ
Ù Ø§ÙØ³Ø±Ù اÙÙØ¯ÙÙ
ØØªÙ تثبت اÙÙ ØµØ§ØØ¨ ÙØ°Ø§ Ø§ÙØØ³Ø§Ø¨."
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr "رÙÙ
Ø³Ø±Ù Ø¬Ø¯ÙØ¯"
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "ÙÙÙ
Ø© Ø§ÙØ³Ø±"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr "ÙÙØ¬Ø¯ Ù
Ù٠آخر Ø¨ÙØ°Ø§ اÙÙ
سار ÙØ¯Ù ÙØ°Ù اÙÙ
ستخدÙ
."
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
msgid "You are editing another user's media. Proceed with caution."
msgstr "Ø£ÙØª ØªØØ±Ùر ÙØ³Ø§Ø¦Ø· Ù
ستخدÙ
آخر. ÙÙ ØØ°Ø±Ùا Ø£Ø«ÙØ§Ø¡ Ø§ÙØ¹Ù
ÙÙØ©."
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr "ÙÙØ¯ ÙÙ
ت Ø¨Ø¥Ø¶Ø§ÙØ© Ù
رÙÙØ© %s!"
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr "ÙÙ
ÙÙÙ ÙÙØ· تعدÙÙ ØØ³Ø§Ø¨Ù Ø§ÙØ®Ø§Øµ"
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Ø£ÙØª ØªØØ±Ùر Ù
ÙÙ Ù
ستخدÙ
آخر. ÙÙ ØØ°Ø±Ùا Ø£Ø«ÙØ§Ø¡ Ø§ÙØ¹Ù
ÙÙØ©."
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr "تÙ
ØÙظ ØªØºÙØ±Ø§Øª ØØ³Ø§Ø¨Ù"
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr "تÙ
ØÙظ خصائص ØØ³Ø§Ø¨Ù"
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr "ÙØ¬Ø¨ عÙÙ٠تأÙÙØ¯ Ø¥ÙØºØ§Ø¡ ØØ³Ø§Ø¨Ù."
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Ø£ÙØª ÙØ¯ÙÙ Ù
جÙ
ÙØ¹Ø© تدع٠\"%s\"!"
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr "ØªÙØ¬Ø¯ Ù
جÙ
ÙØ¹Ø© Ø§Ø®Ø±Ù Ø¨ÙØ°Ø§ اÙÙ
سار ÙÙØ°Ø§ اÙÙ
ستخدÙ
."
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr "Ø£ÙØª تعد٠Ù
جÙ
ÙØ¹Ø© Ù
ستخدÙ
آخر. ÙÙ ØØ°Ø±Ùا Ø£Ø«ÙØ§Ø¡ Ø§ÙØ¹Ù
ÙÙØ©."
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr "ÙÙÙ
ة سر خاطئة"
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr ""
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr "ÙÙ
ÙØªÙ
ربط Ø§ÙØ«ÙÙ
... ÙØ§ØªÙجد Ù
جÙ
ÙØ¹Ø© Ø«ÙÙ
ات\n"
@@ -301,19 +331,62 @@ msgid ""
"domain."
msgstr "CSRF ÙÙÙÙØ² ØºÙØ± Ù
ÙØ¬Ùدة, ÙÙØ°Ø§ Ù
٠اÙÙ
Ù
Ù٠ا٠ÙÙÙÙ ÙØªÙجة ÙÙ
Ø§ÙØ¹ اÙÙÙÙÙØ² ا٠شئ Ù
Ù ÙØ°Ø§ اÙÙØ¨ÙÙ.
ØªØ£ÙØ¯ Ù
٠أÙÙ ÙÙ
ت Ø¨Ø§ÙØ³Ù
Ø§Ø ÙØ®ØµØ§Ø¦Øµ اÙÙÙÙÙØ² ÙÙØ°Ø§ اÙÙ
ÙØ¯Ø§Ù."
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr "عذرا, Ø§ÙØ§ ÙØ§ ادعÙ
ÙØ°Ø§ اÙÙÙØ¹ Ù
٠اÙÙ
ÙÙØ§Øª :("
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr ""
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr "ÙØ´Ù Ù٠تØÙÙ٠اÙÙÙØ¯ÙÙ"
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr "ÙØ§Ù
Ø¨Ø§ÙØªØ¹ÙÙ٠عÙÙ Ù
Ø´Ø§Ø±ÙØªÙ"
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "اسÙ
اÙÙ
ستخدÙ
"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "عÙÙØ§Ù Ø§ÙØ¨Ø±Ùد Ø§ÙØ¥ÙÙØªØ±ÙÙÙ"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr "اÙÙ
ÙØ§Ù"
@@ -377,7 +450,7 @@ msgstr "Ø§ÙØ±Ø§Ø¨Ø· اÙÙ
ÙØ¬Ù ÙÙØ¨Ø±ÙاÙ
ج, ÙØ°Ø§ Ø§ÙØÙÙ\n
msgid "This field is required for public clients"
msgstr "ÙØ°Ø§ Ø§ÙØÙÙ Ù
Ø·ÙÙØ¨ ÙØ¬Ù
ÙÙØ± Ø§ÙØ¹Ù
ÙØ§Ø¡"
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr "Ø§ÙØ¹Ù
ÙÙ {0} تÙ
تسجÙÙÙ!"
@@ -390,59 +463,209 @@ msgid "Your OAuth clients"
msgstr "عÙ
ÙÙ٠اÙÙ
ÙØ´Ø¦"
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr "اضÙ"
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr "Ø¥ÙØºØ§Ø¡"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "تسجÙ٠دخÙÙ"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr "ÙØ´Ù اÙÙÙÙØ¬!"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr "اÙÙ
Ù٠اÙÙ
عط٠ÙÙØ°Ø§ اÙÙÙØ¹ Ù
٠اÙÙ
ÙØ¯Ùا ØºÙØ± صØÙØ."
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr "اÙÙ
ÙÙ"
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr "ÙØ¬Ø¨ أ٠تضع Ù
ÙÙÙØ§."
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr "ÙØ§ Ø³ÙØ§Ù
! ÙÙØ´Ø±Ùت!"
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr "تÙ
Ø¥Ø¶Ø§ÙØ© اÙÙ
جÙ
ÙØ¹Ø© \"%s\"!"
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr "ØªØ£ÙØ¯ Ù
Ù Ø¨Ø±ÙØ¯Ù Ø§ÙØ¥ÙÙØªØ±ÙÙÙ!"
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr "تسجÙÙ Ø®Ø±ÙØ¬"
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr "تسجÙ٠دخÙÙ"
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr "%(user_name)s's ØØ³Ø§Ø¨"
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr "تغÙÙØ± خصائص Ø§ÙØØ³Ø§Ø¨"
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -450,16 +673,16 @@ msgstr "تغÙÙØ± خصائص Ø§ÙØØ³Ø§Ø¨"
msgid "Media processing panel"
msgstr "ÙÙØØ© Ù
Ø¹Ø§ÙØ¬Ø© اÙÙØ³Ø§Ø¦Ø·"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr "تسجÙÙ Ø®Ø±ÙØ¬"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Ø£Ø¶Ù ÙØ³Ø§Ø¦Ø·"
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "Ø¥ÙØ´Ø§Ø¡ Ù
جÙ
ÙØ¹Ø© Ø¬Ø¯ÙØ¯Ø©"
@@ -506,6 +729,59 @@ msgstr "آخر 10 تØÙÙÙØ§Øª ÙØ§Ø¬ØØ©"
msgid "No processed entries, yet!"
msgstr "ÙØ§ ÙÙØ¬Ø¯ Ù
داخ٠Ù
ÙØ¹Ø§Ùجة بعد! "
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -538,19 +814,15 @@ msgid ""
"a happy goblin!"
msgstr "Ù
Ø±ØØ¨Ùا ÙØ§ %(username)sØ\n\nإ٠أردت تغÙÙØ± ÙÙÙ
Ø© سر٠Ù٠غÙÙ Ù
ÙØ¯ÙØ§ØºÙØ¨ÙÙ ÙØ§ÙØªØ Ø§ÙÙØµÙØ© Ø§ÙØªØ§ÙÙØ© ÙÙ Ù
ØªØµÙØÙ:\n\n%(verification_url)s\n\nØ¥Ù ÙÙØª ØªØ±Ù Ø£Ù ÙØ°Ù Ø§ÙØ±Ø³Ø§ÙØ© ÙØµÙØªÙ Ø®Ø·Ø£Ù ÙØªØ¬Ø§ÙÙÙØ§ ÙØ§Ø³ØªÙ
تع بØÙاتÙ!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "ÙØ´Ù اÙÙÙÙØ¬!"
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "Ø£ÙØ§ تÙ
ÙÙ ØØ³Ø§Ø¨Ùا بعدØ"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "Ø£ÙØ´Ø¦ ØØ³Ø§Ø¨Ùا ÙÙØ§!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr "Ø£ÙØ³Ùت ÙÙÙ
Ø© Ø³Ø±ÙØ"
@@ -559,7 +831,7 @@ msgstr "Ø£ÙØ³Ùت ÙÙÙ
Ø© Ø³Ø±ÙØ"
msgid "Create an account!"
msgstr "Ø£ÙØ´Ø¦ ØØ³Ø§Ø¨Ùا!"
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr "Ø£ÙØ´Ø¦"
@@ -593,7 +865,7 @@ msgstr "تÙ
اÙÙØ´Ø± ÙÙÙØ§ Ù MediaGoblin, ÙÙÙ Ø¨Ø±ÙØ§Ù
ج Ø§Ø³ØªØ¶Ø§ÙØ© Ù
ÙØ¯Ùا ÙØ§Ø¦Ù Ø§ÙØ±Ùعة."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr "ÙÙ٠تضÙ٠اÙÙ
ÙØ¯Ùا خاصتÙ, تضع Ø§ÙØªØ¹ÙÙÙØ§Øª, ÙØ§ÙÙ
Ø²ÙØ¯, ÙØ¬Ø¨ عÙÙÙ Ø§ÙØ¯Ø®ÙÙ Ø¨ØØ³Ø§Ø¨ MediaGoblin Ø§ÙØ®Ø§Øµ بÙ."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr "ÙÙØ³ ÙØ¯ÙÙ ÙØ§ØØ¯ ØØªÙ Ø§ÙØ¢ÙØ Ø§Ù٠سÙÙ!"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
+msgid ""
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
+"\n"
+" Set up MediaGoblin on your own server"
msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
@@ -633,13 +910,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr "تعدÙ٠اÙÙ
رÙÙØ§Øª Ù %(media_title)s"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr "Ù
رÙÙØ§Øª"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr "أض٠Ù
رÙÙØ©"
@@ -656,22 +933,29 @@ msgstr "Ø£ÙØºÙ"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "اØÙظ Ø§ÙØªØºÙÙØ±Ø§Øª"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
+msgid "Changing %(username)s's email"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -699,14 +983,14 @@ msgstr "ØªØØ±Ùر %(media_title)s"
msgid "Changing %(username)s's account settings"
msgstr "ÙØºÙÙØ± %(username)s خصائص Ø§ÙØØ³Ø§Ø¨"
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
msgid "Delete my account"
msgstr "Ø¥ÙØºÙ ØØ³Ø§Ø¨Ù"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
@@ -718,6 +1002,36 @@ msgstr "ØªØØ±Ùر %(collection_title)s"
msgid "Editing %(username)s's profile"
msgstr "ØªØØ±Ùر Ù
ÙÙ %(username)s Ø§ÙØ´Ø®ØµÙ"
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -728,8 +1042,7 @@ 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/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr "تØÙ
ÙÙ"
@@ -753,7 +1066,7 @@ msgid ""
msgstr "ØªØ³ØªØ·ÙØ¹ Ø§ÙØØµÙ٠عÙÙ Ù
ØªØµÙØ ØØ¯ÙØ« â\n»ÙÙ
ÙÙ٠تشغÙÙ Ø§ÙØµÙت ÙÙ â\n» http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr "Ù
Ù٠أصÙÙ"
@@ -762,6 +1075,10 @@ msgstr "Ù
Ù٠أصÙÙ"
msgid "WebM file (Vorbis codec)"
msgstr "Ù
ÙÙ WebM (Vorbic ÙÙØ¯ÙÙ)"
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -773,47 +1090,39 @@ msgstr "Ù
ÙÙ WebM (Vorbic ÙÙØ¯ÙÙ)"
msgid "Image for %(media_title)s"
msgstr "ØµÙØ±Ø© Ù%(media_title)s"
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr "تبدÙÙ Ø§ÙØªØ¯ÙÙØ±"
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr "Ù
ÙØ¸Ùر"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr "Ù
ÙØ¯Ù
Ø©"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr "أعÙÙ"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr "Ø¬Ø§ÙØ¨"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr "WebGL"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr "تØÙ
ÙÙ ÙÙ
ÙØ°Ø¬"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr "بÙÙØ© اÙÙ
ÙÙ"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr "Ø·Ù٠اÙÙØ§Ø¦Ù"
@@ -832,8 +1141,8 @@ msgid ""
msgstr "ØªØ³ØªØ·ÙØ¹ Ø§ÙØØµÙ٠عÙÙ Ù
ØªØµÙØ ØØ¯ÙØ« â\n»ÙÙ
ÙÙ٠تشغÙÙ ÙØ°Ø§ اÙÙÙØ¯ÙÙ ÙÙ â\n» http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
-msgstr "WebM Ù
ÙÙ (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
@@ -859,11 +1168,6 @@ msgstr "%(collection_title)s Ø¨ÙØ§Ø³Ø·Ø© %(username)s<
msgid "Edit"
msgstr "تعدÙÙ"
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr "Ø¥ÙØºØ§Ø¡"
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -918,29 +1222,22 @@ msgstr "ÙØ³Ø§Ø¦Ø· %(username)s"
msgid "â Browsing media by %(username)s"
msgstr "â Ø§Ø®ØªÙار اÙÙ
ÙØ¯Ùا Ø¨ÙØ§Ø³Ø·Ø© %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr "أض٠تعÙÙÙ"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr "Ø§Ø¶Ù ÙØ°Ø§ Ø§ÙØªØ¹ÙÙÙ"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1099,26 +1396,34 @@ msgstr "ØªØØ¯Ø¯ ب"
msgid "Could not read the image file."
msgstr "ÙÙ
ÙØ³ØªØ·Ùع ÙØ±Ø§Ø¡Ø© ÙØ°Ù Ø§ÙØµÙرة."
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr "ÙÙØÙ!"
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr "ØØ¯Ø« خطأ"
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr "ØºÙØ± Ù
سÙ
ÙØ Ø¨ÙØ°Ù Ø§ÙØ¹Ù
ÙÙØ©"
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1155,10 +1460,9 @@ msgstr "تعÙÙÙ"
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
-msgstr "باÙ
ÙØ§Ù٠استخداÙ
Markdown ÙÙØ¥Ø¯Ø±Ø§Ø¬."
+"You can use Markdown for formatting."
+msgstr ""
#: mediagoblin/user_pages/forms.py:31
msgid "I am sure I want to delete this"
@@ -1180,77 +1484,80 @@ msgstr "-- إختار --"
msgid "Include a note"
msgstr "إدراج Ù
ÙØ§ØØ¸Ø©"
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
-msgstr "ÙØ§Ù
Ø¨Ø§ÙØªØ¹ÙÙ٠عÙÙ Ù
Ø´Ø§Ø±ÙØªÙ"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
+msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr ""
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr "عذرا, ÙÙØ¯ ÙÙ
ت بادخا٠تعÙÙÙ ÙØ§Ø±Øº."
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr "ÙÙØ¯ تÙ
إرسا٠تعÙÙÙÙ!"
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr "Ù
Ù ÙØ¶ÙÙ ÙÙ
Ø¨ÙØØµ اÙÙ
داخ٠ÙÙÙ
باÙÙ
ØØ§ÙÙØ© Ù
رة أخرÙ."
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr "ÙØ¬Ø¨ عÙÙÙ Ø¥Ø®ØªÙØ§Ø± Ø£Ù Ø¥Ø¶Ø§ÙØ© Ù
جÙ
ÙØ¹Ø©"
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "\"%s\" ØªÙØ¬Ø¯ باÙÙØ¹Ù Ù٠اÙÙ
جÙ
ÙØ¹Ø© \"%s\""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "\"%s\" Ø£ÙØ¶ÙÙØª ÙÙÙ
جÙ
ÙØ¹Ø© \"%s\""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr "ÙÙØ¯ ÙÙ
ت Ø¨Ø¥ÙØºØ§Ø¡ اÙÙ
ÙØ¯Ùا."
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "ÙÙ
ÙØªÙ
Ø¥ÙØºØ§Ø¡ اÙÙ
ÙØ¯Ùا ÙØ£ÙÙ ÙÙ
تÙÙ
Ø¨Ø¥Ø®ØªÙØ§Ø± اÙÙ Ù
ØªØ£ÙØ¯ Ù
٠ذÙÙ."
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "Ø£ÙØª عÙÙ ÙØ´Ù ØØ°Ù ÙØ³Ø§Ø¦Ø· Ù
ستخدÙ
آخر. ÙÙ ØØ°Ø±Ùا Ø£Ø«ÙØ§Ø¡ Ø§ÙØ¹Ù
ÙÙØ©."
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr "ÙÙØ¯ ÙÙ
ت Ø¨Ø¥ÙØºØ§Ø¡ اÙÙ
ادة Ù
٠اÙÙ
جÙ
ÙØ¹Ø©."
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr "ÙÙ
ÙØªÙ
Ø¥ÙØºØ§Ø¡ اÙÙ
ادة ÙØ£ÙÙ ÙÙ
تÙÙ
Ø¨Ø¥Ø®ØªÙØ§Ø± اÙÙ Ù
ØªØ£ÙØ¯ Ù
٠ذÙÙ."
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr "Ø£ÙØª عÙÙ ÙØ´Ù ØØ°Ù Ù
ادة Ù
Ù Ù
جÙ
ÙØ¹Ø© Ù
ستخدÙ
آخر. ÙÙ ØØ°Ø±Ø§."
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "ÙÙØ¯ ÙÙ
ت Ø¨Ø¥ÙØºØ§Ø¡ اÙÙ
جÙ
ÙØ¹Ø© \"%s\""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr "ÙÙ
ÙØªÙ
Ø¥ÙØºØ§Ø¡ اÙÙ
جÙ
ÙØ¹Ø© ÙØ£ÙÙ ÙÙ
تÙÙ
Ø¨Ø¥Ø®ØªÙØ§Ø± اÙÙ Ù
ØªØ£ÙØ¯ Ù
٠ذÙÙ."
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr "Ø£ÙØª عÙÙ ÙØ´Ù ØØ°Ù Ù
جÙ
ÙØ¹Ø© Ù
ستخدÙ
آخر. ÙÙ ØØ°Ø±Ø§."
diff --git a/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.mo
new file mode 100644
index 0000000000000000000000000000000000000000..3dff58f12157b25f4acd3772f9cf434921d948d1
GIT binary patch
literal 24290
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
Nd-rVN;{R*h{{m&q6Dt4!
literal 0
HcmV?d00001
diff --git a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo
index ec01d7f704a98297d3498376e438ec88c01beed6..7c80ee7864df5bb47ac9a7ef9c4cc5de9ed041b7 100644
GIT binary patch
delta 10401
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
delta 4966
zcmciEiFcIM8OQNEfq)5%kc~h{G6{qwKoUX{2(kqTL;@i~1O!k$Zg{*fnVZ;H*7-l$j#xg9xN=(C6T#Nfr8%yu)On4(|A(g0kmSRXNZ=s=qet}xq
z4kRmP7wUm0u_OKwwX-9riH;+4n9otU@60b<&qU?C1eJnmsON7%ZDbLu)>if*{%p={
z<$@mEg9GspDwpR`k+_7+VbW5ZRE$C`*pC{x3AM2GsGV&^rE+)V`hJ{B|5+T0mvIAT
z^(FrA(b&gws&O5qJ_OI8LK@4e(s4YF!o|1|cVY|n;zKR$9@Hs$5>;HUp>}>6`{8Gp
zi9Os-q(-1NP!Xb`5YIt{%!f)r1L}qr)aRQ}1K*3v{o}}(<`61{AD~k91u7y@8BVA>
zqb5#3jWZJU{4^w}Cgh=^9Ii)&{65r*_n~t2Csb9xiwfx()K1T#LLJ5ET6i+*`HVJL04gF+pvM1watp*@O8TmNUPJW%N>rsbTr^Jui
z$sITw_h1EHL@j7iHt!HzjX4-cCA+Z%HC{Dxs|iJX0z+)hyhEc3zr~+p1*7Q|d>ohH
zRm{gF!<-thxQPBPRL(DB2kgYG+F>kShu5Q0kQ^}^RfJ46gYM?gMz=u(xejj7-G%DohQ4#tKJK;rCB)^a7DsuXr
zQR8((Jr^p7G>TCJj>EB7hHtw#tC&H5?kL9=WK7eBIn?RSQ96
zII{ucF@zt0u{4OL2@od@{3wzxa|-8USMqZgPu3u}noDEIBj&P7?X(JYIu>9829Vdg
z*@~)>{iydy7
z-(m(vbEZ;pAojsh)b%B(`!=IeupO1E2l0B`k2UJ)q;XhG3h?(r@*LUO}a}9Tnk|SfL`iN`pEw6|)`hN4=>&L{;f!RPGzAod0+%E};KwWDXO<
zYDv3UfP3*#9EN3coc{|NQN_6rweXiQA3w!wfB)0wI)DEs;~jjk3kxt~o-wO%4(frU
zs0e)%x&9+|qhEK6Q*>)l#k&!^;uh?Q_h2IKLxuhz4!~2lkbgIg4!r1du|H~nD%6VS
zV{dFm<$MRmV;d&mGpPHHq9XJW4#cat2nP}-vSn^Z>esx7+E~9^ok-8SmG~EPVJ{c9
z;Yn;o@4`rkP`OHDH0sMt!~oudUW{JsoQ9P+i2j|Jgug?j;0+vu-=Q`#a*6W-x(SES
zzb!-~j>a>Xj)$=hKSJ$frpF0Y6Kco1u>*!t#q>O?>R(2^FOH#7^cE_TCs2_)iLrPN
z75WRP=lUj9JB<`n&fHjn!!UdzVX$lD(mGEdFgCM#O)%)MU+h^L^g*q!rnZisV5Yma
z!Ml8HX4aqvZ;dYy^foMB(@-}!kZI3O$?o89h_yWuhGsPRR{C;Qd6)S-HU8>4Uww|h
zp(eM?vvj4ezNXCI6!hDtrVO=*rly9IlU|InpC^y7xxL@8XS1f*Reh|@O-Z!BOt~7f
znw2#98~1ZmcHEfb8oPZx+`pQMp1ZEMq5-kC95GS
z$-gFOru%DZn9c30cQ5z&>b%P`>{|ot(C+=Gb$2&-JMC)YN#Fxtn~!T0=V!ZqDECvSkJD
z+M>dtHovG>__4y(9lF%i)Op>r{6SC9YZHpc*w*50or((bR^Q+bcOQLIl#LJc3tt-Z
z7nfZzeuHbAeL0vKesV%jmo1!FV&9%P&K6ACWS{Mq6#i(E+Z9_lEPteX_=wSk1-5Hx
zTBJLQZn&Uym@Aw;b^QN1Yc@IQe0ar;pSWz^)Fiv9e55^A{;54Z{e5LFJiTIw>%UUB
zd1m>J)C}9TGCRDz@-~+(nbm09X9eu?*-iH2*#Wz@sxo|~sy!`aZFfS5#cf%6luG{@<)@t}nA!>vzSKG&K9xxaWGSXSfGNGPKX{j|#Uo
zJm<1!g29+de=y))6Yw\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/mediagoblin/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -21,250 +21,280 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "Nom d'usuari"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "Contrasenya"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "Adreça electrònica"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Ho sentim, el registre està desactivat en aquest cas."
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr "Nom d'usuari o correu"
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr ""
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr ""
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr ""
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "Ho sentim, el registre està desactivat en aquest cas."
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "Lamentablement aquest usuari ja existeix."
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr "Perdó, ja existeix un usuari amb aquesta adreça de correu."
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "Ja s'ha verificat la vostra adreça electrònica. Ara podeu entrar, editar el vostre perfil i penjar imatge!"
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "La clau de verificació o la identificació de l'usuari no són correctes."
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr "Has d'estar conectat per saber a qui hem d'enviar el correu!"
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr "Ja has verificat la teva adreça de correu!"
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "Torna'm a enviar el correu de verificació"
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "S'ha enviat un correu amb instruccions de com cambiar la teva contrasenya"
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
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:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
msgid "You can now log in using your new password."
msgstr "Ara et pots conectar amb la teva nova contrasenya."
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "TÃtol"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr "Descripció d'aquest treball."
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr "Pots utilitzarâ â Markdown per donar-li format"
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "Etiquetes"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr "Separa els tags amb comes."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr "Llimac"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr "El llimac no pot ésser buit"
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
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/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr "Llicència"
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr "Biografia"
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "Lloc web"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr "Aquesta adreça conté errors"
-#: mediagoblin/edit/forms.py:63
-msgid "License preference"
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr "Envia'm correu quan d'altres comentin al meu mitjà "
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
msgstr ""
#: mediagoblin/edit/forms.py:69
-msgid "This will be your default license on upload forms."
+msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
-msgstr "Envia'm correu quan d'altres comentin al meu mitjà "
+#: mediagoblin/edit/forms.py:75
+msgid "This will be your default license on upload forms."
+msgstr ""
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr "El tÃtol no pot ser buit"
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "Descripció d'aquesta col.lecció"
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr "La part del tÃtol de l'adreça d'aquesta col.lecció. Normalment no cal que canviis això."
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr "Contrasenya antiga"
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr "Introdueix la teva contrasenya antiga per comprovar que aquest compte és teu."
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr "Nova contrasenya"
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "Contrasenya"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr "Ja existeix una entrada amb aquest llimac per aquest usuari"
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
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:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr ""
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr ""
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
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:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr "Els canvis al perfil s'han guardat"
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr "Els detalls del compte s'han guardat"
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Ja tens una col.lecció anomenada \"%s\"!"
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr "Estas editant la col.lecció d'un altre usuari. Prossegueix amb cautela."
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr "Contrasenya errònia"
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr ""
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr "No es pot enllaçar el tema... no hi ha tema establert\n"
@@ -299,19 +329,62 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr "Ho sento, no puc manegar aquest tipus d'arxiu :("
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr ""
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr "La transformació del vÃdeo ha fallat"
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr "comentat al teu post"
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "Nom d'usuari"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "Adreça electrònica"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr "Ubicació"
@@ -375,7 +448,7 @@ msgstr "La URI de redirecció per les aplicacions, aquest camp\n és
msgid "This field is required for public clients"
msgstr "Aquest camp és requeriment per a clients públics"
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr "El client {0} ha sigut enregistrat!"
@@ -388,59 +461,209 @@ msgid "Your OAuth clients"
msgstr ""
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr "Afegir"
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr "Esborrar"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "Entra"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr "Inici de sessió ha fallat!"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr "Aquest tipus de fitxer no és và lid."
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr "Fitxer"
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr "Heu d'escollir un fitxer."
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr "Visca! S'ha enviat!"
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr "S'ha afegit la col.leccio \"%s\"!"
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr "Verifica el teu correu electrònic"
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr "Entra"
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr "Modificar els ajustaments del compte"
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -448,16 +671,16 @@ msgstr "Modificar els ajustaments del compte"
msgid "Media processing panel"
msgstr "Quadre de processament de fitxers"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Tots els fitxers"
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
@@ -504,6 +727,59 @@ msgstr "Les últimes 10 pujades correctes"
msgid "No processed entries, yet!"
msgstr "Encara no hi ha entrades processades!"
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -536,19 +812,15 @@ msgid ""
"a happy goblin!"
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!"
-msgstr "Inici de sessió ha fallat!"
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "Encara no teniu un compte?"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "Creeu-ne un aquÃ!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr "Has oblidat la teva contrasenya?"
@@ -557,7 +829,7 @@ msgstr "Has oblidat la teva contrasenya?"
msgid "Create an account!"
msgstr "Creeu un compte!"
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr "Crea"
@@ -591,7 +863,7 @@ msgstr "Alliberat segons la MediaGoblin, una gran i extraordinà ria peça de software per allotjar mitjans."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr "Per afegir el teu propi mitjà , col.locar comentaris, i més, pots conectar-te amb el teu compte MediaGoblin."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr "No en tens una encara? Es fà cil!"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
+msgid ""
+"\n"
+" Set up MediaGoblin on your own server"
msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
@@ -631,13 +908,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr "Editant afegits per a %(media_title)s"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr ""
@@ -654,22 +931,29 @@ msgstr "Cancel·la"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "Desa els canvis"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
+msgid "Changing %(username)s's email"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -697,12 +981,12 @@ msgstr "Edició %(media_title)s "
msgid "Changing %(username)s's account settings"
msgstr "Modificant els detalls del compte de %(username)s"
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
+msgid "Delete my account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
-msgid "Delete my account"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
@@ -716,6 +1000,36 @@ msgstr "Editant %(collection_title)s"
msgid "Editing %(username)s's profile"
msgstr "Editant perfil de %(username)s"
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -726,8 +1040,7 @@ 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/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr "Descarregar"
@@ -751,7 +1064,7 @@ msgid ""
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/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr "Arxiu original"
@@ -760,6 +1073,10 @@ msgstr "Arxiu original"
msgid "WebM file (Vorbis codec)"
msgstr "Arxiu WebM (Vorbis codec)"
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -771,47 +1088,39 @@ msgstr "Arxiu WebM (Vorbis codec)"
msgid "Image for %(media_title)s"
msgstr "Imatge per %(media_title)s"
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr ""
@@ -830,8 +1139,8 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
-msgstr "Arxiu WebM (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
@@ -857,11 +1166,6 @@ msgstr "%(collection_title)s per a %(username)s"
msgid "Edit"
msgstr "Editar"
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr "Esborrar"
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -916,29 +1220,22 @@ msgstr "%(username)s's media"
msgid "â Browsing media by %(username)s"
msgstr "â Navegant mitjà per a %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr "Afegeix un comentari"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr "Afegir aquest comentari"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1097,26 +1394,34 @@ msgstr ""
msgid "Could not read the image file."
msgstr "No s'ha pogut llegir l'arxiu d'imatge"
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr "Ups!"
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr ""
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr ""
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1153,10 +1458,9 @@ msgstr ""
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
-msgstr "Pots usar Markdown per donar format."
+"You can use Markdown for formatting."
+msgstr ""
#: mediagoblin/user_pages/forms.py:31
msgid "I am sure I want to delete this"
@@ -1178,77 +1482,80 @@ msgstr "-- Sel.leccionar --"
msgid "Include a note"
msgstr "Incluir una nota"
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
-msgstr "comentat al teu post"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
+msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr ""
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr "Uups, el teu comentari era buit."
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr "El teu comentari s'ha publicat!"
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr "Si et plau, comprova les teves entrades i intenta-ho de nou."
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr "Has de sel.leccionar o afegir una col.lecció"
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "\"%s\" ja és a la col.lecció \"%s\""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "\"%s\" afegir a la col.lecció \"%s\""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr "Has esborrat el mitjà "
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "El mitjà no s'ha esborrat perque no has marcat que n'estiguessis segur."
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "Ets a punt d'esborrar el mitjà d'un altre usuari. Prossegueix amb cautela."
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr "Has esborrat l'element de la col.lecció"
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr "L'element no s'ha eliminat perque no has marcat que n'estiguessis segur."
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr "Ets a punt d'esborrar un element de la col.lecció d'un altre usuari. Prossegueix amb cautela."
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "Has esborrat la col.lecció \"%s\""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr "La col.lecció no s'ha esborrat perquè no has marcat que n'estiguessis segur."
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
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 53e3fedf393de44133cddd6144eebdd0e87ded4d..a9111c301ccce1674168c92e98cf926e64e2e912 100644
GIT binary patch
literal 30478
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
delta 4942
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
diff --git a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po
index c78c08ac..54ec9491 100644
--- a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/da/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: 2013-05-27 13:54-0500\n"
-"PO-Revision-Date: 2013-05-27 18:54+0000\n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: Danish (http://www.transifex.com/projects/p/mediagoblin/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -21,250 +21,280 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "Brugernavn"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "Kodeord"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "Email adresse"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Desværre, registrering er ikke muligt på denne instans"
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr "Brugernavn eller email"
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr ""
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr ""
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr ""
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "Desværre, registrering er ikke muligt på denne instans"
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "Desværre, det brugernavn er allerede brugt"
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr "Desværre, en bruger er allerede oprettet for den email"
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "Din email adresse er blevet bekræftet. Du kan nu logge på, ændre din profil, og indsende billeder!"
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "Bekræftelsesnøglen eller brugerid er forkert"
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr "Du er nødt til at være logget ind, så vi ved hvem vi skal emaile!"
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr "Du har allerede bekræftet din email adresse!"
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "Email til godkendelse sendt igen."
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "En email er blevet sendt med instruktioner til at ændre dit kodeord."
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
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:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
msgid "You can now log in using your new password."
msgstr "Du kan nu logge ind med dit nye kodeord."
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "Titel"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr "Beskrivelse af arbejdet"
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr "Du kan bruge\n \n Markdown til formattering."
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "Tags"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr "Separer tags med kommaer."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
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/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr "Licens"
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr "Bio"
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "Websted"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr "Denne adresse indeholder fejl"
-#: mediagoblin/edit/forms.py:63
-msgid "License preference"
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr "Email mig når andre kommenterer på mine medier"
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
msgstr ""
#: mediagoblin/edit/forms.py:69
-msgid "This will be your default license on upload forms."
+msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
-msgstr "Email mig når andre kommenterer på mine medier"
+#: mediagoblin/edit/forms.py:75
+msgid "This will be your default license on upload forms."
+msgstr ""
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr "Titlen kan ikke være tom"
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "Beskrivelse af denne samling"
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr "Titeldelen af denne samlings's adresse. Du behøver normalt ikke ændre dette."
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr "Gammelt kodeord"
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr "Skriv dit gamle kodeord for at bevise det er din konto."
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr "Ny kodeord"
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "Kodeord"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
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:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr ""
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr ""
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Du er ved at ændre en bruger's profil. Pas på."
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr "Profilændringer gemt"
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr "Kontoindstillinger gemt"
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Du har allerede en samling ved navn \"%s\"!"
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr "Du er ved at ændre en anden bruger's samling. Pas på."
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr "Forkert kodeord"
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr ""
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr "Kan ikke linke til tema... intet tema sat\n"
@@ -299,19 +329,62 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr "Desværre, jeg understøtter ikke den filtype :("
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr ""
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr ""
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "Brugernavn"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "Email adresse"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr ""
@@ -375,7 +448,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr "Dette felt er nødvendigt for offentlige klienter"
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr "Klienten {0} er blevet registreret!"
@@ -388,59 +461,209 @@ msgid "Your OAuth clients"
msgstr ""
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr ""
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "Log ind"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr "Forkert fil for medietypen."
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr "Fil"
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr "Du må give mig en fil"
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr "Juhuu! Delt!"
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr "Bekræft din email!"
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr "Log ind"
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -448,16 +671,16 @@ msgstr ""
msgid "Media processing panel"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
@@ -504,6 +727,59 @@ msgstr ""
msgid "No processed entries, yet!"
msgstr ""
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -536,19 +812,15 @@ msgid ""
"a happy goblin!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "Har du endnu ikke en konto?"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "Opret en her!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr ""
@@ -557,7 +829,7 @@ msgstr ""
msgid "Create an account!"
msgstr "Opret en konto!"
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr ""
@@ -591,7 +863,7 @@ msgstr ""
msgid "Explore"
msgstr "Udforsk"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr "Hey, velkommen til denne MediaGoblin side!"
@@ -601,22 +873,27 @@ msgid ""
"extraordinarily great piece of media hosting software."
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr "For at tilføje dine egne medier, skrive kommentarer, og mere, du kan logge ind med din MediaGoblin konto."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr "Har du ikke en endnu? Det er let!"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
+msgid ""
+"\n"
+" Set up MediaGoblin on your own server"
msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
@@ -631,13 +908,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr ""
@@ -654,22 +931,29 @@ msgstr "Afbryd"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "Gem ændringer"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
+msgid "Changing %(username)s's email"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -697,12 +981,12 @@ msgstr ""
msgid "Changing %(username)s's account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
+msgid "Delete my account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
-msgid "Delete my account"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
@@ -716,6 +1000,36 @@ msgstr ""
msgid "Editing %(username)s's profile"
msgstr "Redigerer %(username)s profil"
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -726,8 +1040,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr ""
@@ -751,7 +1064,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr ""
@@ -760,6 +1073,10 @@ msgstr ""
msgid "WebM file (Vorbis codec)"
msgstr ""
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -771,47 +1088,39 @@ msgstr ""
msgid "Image for %(media_title)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr ""
@@ -830,7 +1139,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
@@ -857,11 +1166,6 @@ msgstr ""
msgid "Edit"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -916,29 +1220,22 @@ msgstr ""
msgid "â Browsing media by %(username)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1097,26 +1394,34 @@ msgstr ""
msgid "Could not read the image file."
msgstr ""
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr "Hovsa!"
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr ""
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr ""
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1153,9 +1458,8 @@ msgstr ""
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
+"You can use Markdown for formatting."
msgstr ""
#: mediagoblin/user_pages/forms.py:31
@@ -1178,77 +1482,80 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr ""
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr ""
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr ""
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr ""
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr ""
diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo
index e2fcf85db38e1f0bcc77ff465a9071cea399b80a..7be0f35ec28fc8a3e2b3fe1ba6793a053ee82146 100644
GIT binary patch
delta 10488
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
Ok`7;YMqgX^-ai0{8$Rm*
diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
index e2147070..6b75198b 100644
--- a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
@@ -15,15 +15,15 @@
# Elrond , 2011
# Art O. Pal , 2011
# spaetz , 2012
-# Vinzenz Vietzke , 2012
-# Vinzenz Vietzke , 2011
+# vinzv Vietzke , 2012
+# vinzv Vietzke , 2011
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-05-27 13:54-0500\n"
-"PO-Revision-Date: 2013-05-28 10:43+0000\n"
-"Last-Translator: Elrond \n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -32,250 +32,280 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "Benutzername"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "Passwort"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "E-Mail-Adresse"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Benutzerregistrierung ist auf diesem Server leider deaktiviert."
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
-msgstr "Benutzername oder E-Mail-Adresse"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr "Benutzername oder E-Mail-Adresse"
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr "Ungültiger Benutzername oder E-Mail-Adresse."
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr "Dieses Feld akzeptiert keine E-Mail-Adressen."
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr "Dieses Feld benötigt eine E-Mail-Adresse."
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "Benutzerregistrierung ist auf diesem Server leider deaktiviert."
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "Leider gibt es bereits einen Benutzer mit diesem Namen."
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr "Leider gibt es bereits einen Benutzer mit dieser E-Mail-Adresse."
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "Dein GNU MediaGoblin Konto wurde hiermit aktiviert. Du kannst dich jetzt anmelden, dein Profil bearbeiten und Medien hochladen."
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "Der Aktivierungsschlüssel oder die Nutzerkennung ist falsch."
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr "Du musst angemeldet sein, damit wir wissen, wer die Email bekommt."
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr "Deine E-Mail-Adresse wurde bereits aktiviert."
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "Aktivierungsmail wurde erneut versandt."
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr "Falls jemand mit dieser E-Mail-Adresse (GroÃ- und Kleinschreibung wird unterschieden!) registriert ist, wurde eine E-Mail mit Anleitungen verschickt, wie Du Dein Passwort ändern kannst."
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr "Es konnte niemand mit diesem Benutzernamen gefunden werden."
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "Es wurde eine E-Mail mit der Anleitung zur Ãnderung des Passwortes an Dich gesendet."
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr "Die E-Mail zur Wiederherstellung des Passworts konnte nicht verschickt werden, weil dein Benutzername inaktiv oder deine E-Mail-Adresse noch nicht aktiviert wurde."
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
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:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "Titel"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr "Beschreibung des Werkes"
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr "Die Texte lassen sich durch Markdown formatieren."
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "Schlagwörter"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr "Kommaseparierte Schlagwörter"
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr "Kurztitel"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr "Bitte gib einen Kurztitel ein"
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr "Der Titelteil der Medienadresse. Normalerweise muss hier nichts geändert werden."
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr "Lizenz"
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr "Biographie"
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "Webseite"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr "Diese Adresse ist fehlerhaft"
-#: mediagoblin/edit/forms.py:63
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr "Mir eine E-Mail schicken, wenn andere meine Medien kommentieren"
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:69
msgid "License preference"
msgstr "Bevorzugte Lizenz"
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:75
msgid "This will be your default license on upload forms."
msgstr "Dies wird Deine Standardlizenz in den Upload-Forumularen sein."
-#: 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:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr "Der Titel kann nicht leer sein"
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "Beschreibung dieser Sammlung"
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr "Der Titelteil dieser Sammlungsadresse. Du musst ihn normalerweise nicht ändern."
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr "Altes Passwort"
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr "Gib dein altes Passwort ein, um zu bestätigen, dass du dieses Konto besitzt."
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr "Neues Passwort"
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "Passwort"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr "Diesen Kurztitel hast du bereits vergeben."
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
msgid "You are editing another user's media. Proceed with caution."
msgstr "Du bearbeitest die Medien eines anderen Nutzers. Sei bitte vorsichtig."
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr "Sie haben den Anhang %s hinzugefügt!"
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr "Du kannst nur dein eigenes Profil bearbeiten."
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Du bearbeitest das Profil eines anderen Nutzers. Sei bitte vorsichtig."
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr "Das Profil wurde aktualisiert"
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr "Kontoeinstellungen gespeichert"
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr "Du musst die Löschung deines Kontos bestätigen."
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Du hast bereits eine Sammlung mit Namen »%s«!"
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr "Eine Sammlung mit diesem Kurztitel existiert bereits für diesen Benutzer."
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr "Du bearbeitest die Sammlung eines anderen Benutzers. Sei vorsichtig."
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr "Falsches Passwort"
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr ""
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr "Theme kann nicht verknüpft werden ⦠Kein Theme gesetzt\n"
@@ -310,19 +340,62 @@ msgid ""
"domain."
msgstr "Das CSRF cookie ist nicht vorhanden. Das liegt vermutlich an einem Cookie-Blocker oder ähnlichem.
Bitte stelle sicher, dass Cookies von dieser Domäne erlaubt sind."
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr "Entschuldigung, dieser Dateityp wird nicht unterstützt."
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr ""
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr "Videokonvertierung fehlgeschlagen"
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr "hat dein Medium kommentiert"
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "Benutzername"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "E-Mail-Adresse"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr "Benutzername oder E-Mail-Adresse"
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr "Aufnahmeort"
@@ -386,7 +459,7 @@ msgstr "Die Weiterleitungs-URI für die Anwendung, dieses Feld\n ist
msgid "This field is required for public clients"
msgstr "Dieses Feld ist Pflicht für öffentliche Clients"
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr "Client {0} wurde registriert!"
@@ -399,59 +472,209 @@ msgid "Your OAuth clients"
msgstr "Deine OAuth-Clients"
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr "Hinzufügen"
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr "Löschen"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "Anmelden"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr "Anmeldevorgang fehlgeschlagen!"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr "Die Datei stimmt nicht mit dem gewählten Medientyp überein."
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr "Datei"
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr "Du musst eine Datei angeben."
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr "JAAA! Geschafft!"
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr "Sammlung »%s« hinzugefügt!"
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr "Bitte bestätige Deine E-Mail-Adresse!"
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr "abmelden"
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr "Anmelden"
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr "%(user_name)ss Konto"
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr "Kontoeinstellungen ändern"
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -459,16 +682,16 @@ msgstr "Kontoeinstellungen ändern"
msgid "Media processing panel"
msgstr "Medienverarbeitung"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr "Abmelden"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Medien hinzufügen"
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "Neues Album erstellen"
@@ -515,6 +738,59 @@ msgstr "Die letzten zehn erfolgreichen Uploads"
msgid "No processed entries, yet!"
msgstr "Noch keine verarbeiteten Einträge!"
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -547,19 +823,15 @@ msgid ""
"a happy goblin!"
msgstr "Hallo %(username)s,\n\num dein GNU-MediaGoblin-Passwort zu ändern, öffne folgende URL\nin deinem Webbrowser:\n\n%(verification_url)s\n\nWenn du denkst, dass es sich hierbei um einen Fehler handelt,\nignoriere einfach diese E-Mail und bleib ein glücklicher Goblin!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "Anmeldevorgang fehlgeschlagen!"
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "Hast du noch keines?"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "Registriere dich einfach hier!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr "Passwort vergessen?"
@@ -568,7 +840,7 @@ msgstr "Passwort vergessen?"
msgid "Create an account!"
msgstr "Neues Nutzerkonto registrieren!"
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr "Registrieren"
@@ -602,7 +874,7 @@ msgstr "Veröffentlicht unter der MediaGoblin ein, eine groÃartige Software für Medienhosting."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
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, andere zu kommentieren und vieles mehr."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr "Hast du noch keinen? Das geht ganz einfach!"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
+msgid ""
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "Registriere dich auf dieser Seite oder Installiere MediaGoblin auf deinem eigenen Server"
+"\n"
+" Set up MediaGoblin on your own server"
+msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
@@ -642,13 +919,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr "Bearbeite Anhänge von %(media_title)s"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr "Anhänge"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr "Anhang hinzufügen"
@@ -665,22 +942,29 @@ msgstr "Abbrechen"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "Ãnderungen speichern"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
+msgid "Changing %(username)s's email"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -708,14 +992,14 @@ msgstr "%(media_title)s bearbeiten"
msgid "Changing %(username)s's account settings"
msgstr "%(username)ss Kontoeinstellungen ändern"
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
msgid "Delete my account"
msgstr "Mein Konto löschen"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
@@ -727,6 +1011,36 @@ msgstr "Bearbeite %(collection_title)s"
msgid "Editing %(username)s's profile"
msgstr "%(username)ss Profil bearbeiten"
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -737,8 +1051,7 @@ 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/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr "Download"
@@ -762,7 +1075,7 @@ msgid ""
msgstr "Hol dir auf http://getfirefox.com einen modernen Webbrowser, der dieses Audiostück abspielen kann!"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr "Originaldatei"
@@ -771,6 +1084,10 @@ msgstr "Originaldatei"
msgid "WebM file (Vorbis codec)"
msgstr "WebM-Datei (Vorbis-Codec)"
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr "Originaldatum"
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -782,47 +1099,39 @@ msgstr "WebM-Datei (Vorbis-Codec)"
msgid "Image for %(media_title)s"
msgstr "Bild für %(media_title)s"
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr "PDF-Datei"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr "Perspektive"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr "Vorderseite"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr "WebGL"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr "Modell herunterladen"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr "Dateiformat"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr "Objekthöhe"
@@ -841,8 +1150,8 @@ msgid ""
msgstr "Hol dir auf http://getfirefox.com einen modernen Webbrowser, der dieses Video abspielen kann!"
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
-msgstr "WebM-Datei (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
@@ -868,11 +1177,6 @@ msgstr "%(collection_title)s von %(username)s"
msgid "Edit"
msgstr "Bearbeiten"
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr "Löschen"
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -927,29 +1231,22 @@ msgstr "%(username)ss Medien"
msgid "â Browsing media by %(username)s"
msgstr "â Medien von %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr "Einen Kommentar schreiben"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr "Kommentar absenden"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr "Hinzugefügt"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr "Originaldatum"
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1108,26 +1405,34 @@ msgstr "Schlagwörter"
msgid "Could not read the image file."
msgstr "Die Bilddatei konnte nicht gelesen werden."
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr "Hoppla!"
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr "Ein Fehler trat auf"
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr "Funktion nicht erlaubt"
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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 "So nicht!
Du wolltest eine Funktion verwenden zu der Du nicht die nötigen Rechte Rechte besitzt. Wolltest Du etwa schon wieder alle Nutzerkonten löschen?"
-#: mediagoblin/tools/response.py:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1164,10 +1469,9 @@ msgstr "Kommentar"
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
-msgstr "Die Texte lassen sich durch Markdown formatieren."
+"You can use Markdown for formatting."
+msgstr ""
#: mediagoblin/user_pages/forms.py:31
msgid "I am sure I want to delete this"
@@ -1189,77 +1493,80 @@ msgstr "-- Auswählen --"
msgid "Include a note"
msgstr "Notiz anfügen"
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
-msgstr "hat dein Medium kommentiert"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
+msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr ""
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr "Hoppla, der Kommentartext fehlte."
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr "Dein Kommentar wurde angenommen!"
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr "Bitte prüfe deinen Einträge und versuche erneut."
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr "Du musst eine Sammlung auswählen oder hinzufügen"
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "»%s« ist bereits in der Sammlung »%s«"
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "»%s« zur Sammlung »%s« hinzugefügt"
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr "Du hast das Medium gelöscht."
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "Das Medium wurde nicht gelöscht, da nicht angekreuzt hast, dass du es wirklich löschen möchtest."
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "Du versuchst Medien eines anderen Nutzers zu löschen. Sei bitte vorsichtig."
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr "Du hast das Objekt aus der Sammlung gelöscht."
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
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:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr "Du bist dabei ein Objekt aus der Sammlung eines anderen Nutzers zu entfernen. Sei vorsichtig."
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "Du hast die Sammlung »%s« gelöscht"
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr "Die Sammlung wurde nicht gelöscht, weil du nicht bestätigt hast, dass du dir sicher bist."
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
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 1b22b786..992588b9 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: 2013-06-16 20:06-0500\n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,110 +17,117 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 0.9.6\n"
-#: mediagoblin/auth/forms.py:25
-msgid "Username"
-msgstr ""
-
-#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:44
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr ""
-
-#: mediagoblin/auth/forms.py:33
-msgid "Email address"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
msgstr ""
-#: mediagoblin/auth/forms.py:40
-msgid "Username or Email"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
msgstr ""
-#: mediagoblin/auth/forms.py:51
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr ""
-#: mediagoblin/auth/tools.py:42
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr ""
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr ""
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr ""
-#: mediagoblin/auth/tools.py:109
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr ""
-#: mediagoblin/auth/tools.py:113
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr ""
-#: mediagoblin/auth/views.py:43
-msgid "Sorry, registration is disabled on this instance."
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
msgstr ""
-#: mediagoblin/auth/views.py:133
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your "
"profile, and submit images!"
msgstr ""
-#: mediagoblin/auth/views.py:139
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr ""
-#: mediagoblin/auth/views.py:157
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr ""
-#: mediagoblin/auth/views.py:165
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr ""
-#: mediagoblin/auth/views.py:178
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr ""
-#: mediagoblin/auth/views.py:209
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been "
"sent with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:220
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:223
+#: mediagoblin/auth/views.py:251
msgid "An email has been sent with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:230
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or "
"your account's email address has not been verified."
msgstr ""
-#: mediagoblin/auth/views.py:287
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr ""
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr ""
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" for formatting."
msgstr ""
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr ""
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr ""
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr ""
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr ""
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr ""
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr ""
-#: mediagoblin/edit/forms.py:63
-msgid "License preference"
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
msgstr ""
#: mediagoblin/edit/forms.py:69
-msgid "This will be your default license on upload forms."
+msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
+#: mediagoblin/edit/forms.py:75
+msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr ""
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr ""
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr ""
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
msgid "You are editing another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr ""
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr ""
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
msgid "You are editing a user's profile. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr ""
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr ""
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr ""
@@ -295,19 +325,62 @@ msgid ""
"this domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr ""
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr ""
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr ""
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr ""
@@ -375,7 +448,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr ""
@@ -388,59 +461,208 @@ msgid "Your OAuth clients"
msgstr ""
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr ""
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a "
+"password set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid "Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr ""
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr ""
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr ""
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr ""
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -448,16 +670,16 @@ msgstr ""
msgid "Media processing panel"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
@@ -503,6 +725,59 @@ msgstr ""
msgid "No processed entries, yet!"
msgstr ""
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -535,19 +810,15 @@ msgid ""
"a happy goblin!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr ""
@@ -556,7 +827,7 @@ msgstr ""
msgid "Create an account!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr ""
@@ -591,7 +862,7 @@ msgstr ""
msgid "Explore"
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr ""
@@ -601,25 +872,29 @@ msgid ""
"an extraordinarily great piece of media hosting software."
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
msgid ""
"To add your own media, place comments, and more, you can log in with your"
" MediaGoblin account."
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
msgid ""
-"Create an "
-"account at this site\n"
-" or\n"
-" Set up MediaGoblin on "
-"your own server"
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
+msgid ""
+"\n"
+" Set up MediaGoblin on your "
+"own server"
msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
@@ -634,13 +909,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:193
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr ""
@@ -657,22 +932,29 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
+msgid "Changing %(username)s's email"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -700,12 +982,12 @@ msgstr ""
msgid "Changing %(username)s's account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
+msgid "Delete my account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
-msgid "Delete my account"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
@@ -719,6 +1001,38 @@ msgstr ""
msgid "Editing %(username)s's profile"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then"
+" \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can "
+"ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -729,8 +1043,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr ""
@@ -754,7 +1067,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr ""
@@ -767,13 +1080,6 @@ msgstr ""
msgid "Created"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -785,47 +1091,39 @@ msgstr ""
msgid "Image for %(media_title)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr ""
@@ -844,7 +1142,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
@@ -871,11 +1169,6 @@ msgstr ""
msgid "Edit"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -931,15 +1224,19 @@ msgstr ""
msgid "â Browsing media by %(username)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr ""
@@ -1099,26 +1396,34 @@ msgstr ""
msgid "Could not read the image file."
msgstr ""
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr ""
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr ""
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr ""
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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:60
+#: mediagoblin/tools/response.py:69
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 "
@@ -1156,8 +1461,8 @@ msgstr ""
#: mediagoblin/user_pages/forms.py:25
msgid ""
"You can use Markdown "
-"for formatting."
+"href=\"http://daringfireball.net/projects/markdown/basics\" "
+"target=\"_blank\">Markdown for formatting."
msgstr ""
#: mediagoblin/user_pages/forms.py:31
@@ -1180,78 +1485,83 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr ""
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr ""
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr ""
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr ""
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed "
"with caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were "
"sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid "You are about to delete another user's collection. Proceed with caution."
msgstr ""
diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo
index 645af16b65b9011974bc79cd2c248e923c6417c9..7f674ff668119f921bbc995cc15bddb8813c18b9 100644
GIT binary patch
delta 10504
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
Z+#9#%*x55D*gxNT&sQCFTLZ&={{yQK(J24`
delta 5060
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
diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po
index 873869f0..ddbd1262 100644
--- a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-05-27 13:54-0500\n"
-"PO-Revision-Date: 2013-06-01 21:16+0000\n"
-"Last-Translator: aleksejrs \n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 19:18+0000\n"
+"Last-Translator: cwebber \n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/mediagoblin/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,250 +22,280 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "Uzantnomo"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "Pasvorto"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "RetpoÅtadreso"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "BedaÅrinde, registrado estas malaktivigita en tiu Äi instalaĵo."
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
-msgstr "Uzantonomo aÅ retpoÅtadreso"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr "Salutnomo aÅ retpoÅtadreso"
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr "Nevalida ensalutnomo aÅ retpoÅtadreso."
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr "Äi tiu kampo ne akceptas retpoÅtadresojn."
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr "Äi tiu kampo postulas retpoÅtadreson."
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "BedaÅrinde, registrado estas malaktivigita en tiu Äi instalaĵo."
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "BedaÅrinde, uzanto kun tiu nomo jam ekzistas."
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr "Ni bedaÅras, sed konto kun tiu retpoÅtadreso jam ekzistas."
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "Via retpoÅtadreso estas konfirmita. Vi povas nun ensaluti, redakti vian profilon, kaj alÅuti bildojn!"
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "La kontrol-kodo aÅ la uzantonomo ne estas korekta"
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr "Vi devas esti ensalutita, por ke ni sciu, al kiu sendi la retleteron!"
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr "Vi jam konfirmis vian retpoÅtadreson!"
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "Resendi vian kontrol-mesaÄon."
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr "Se tiu retpoÅtadreso (majuskloj gravas!) estas registrita, tien senditas retletero kun instrukcio pri kiel ÅanÄi vian pasvorton."
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr "Trovitas neniu kun tiu ensalutnomo."
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "Senditas retletero kun instrukcio pri kiel ÅanÄi vian pasvorton."
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr "Ni ne povas sendi pasvortsavan retleteron, Äar aÅ via konto estas neaktiva, aÅ Äia retpoÅtadreso ne estis konfirmita."
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
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:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "Titolo"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
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:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr "Vi povas uzi por markado la lingvon\n «\n Markdown»."
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "Etikedoj"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr "Dividu la etikedojn per komoj."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr "La distingiga adresparto"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr "La distingiga adresparto ne povas esti malplena"
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr "La dosiertitol-bazita parto de la dosieradreso. Ordinare ne necesas Äin ÅanÄi."
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr "Permesilo"
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr "Bio"
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "Retejo"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr "Äi tiu adreso enhavas erarojn"
-#: mediagoblin/edit/forms.py:63
+#: mediagoblin/edit/forms.py:65
+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:67
+msgid "Enable/Disable insite notifications"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:69
msgid "License preference"
msgstr "Permesila prefero"
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:75
msgid "This will be your default license on upload forms."
msgstr "Tiu Äi permesilo estos antaÅelektita en la alÅutformularoj."
-#: 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:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr "La titolo ne povas malpleni."
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "Priskribo de la kolekto"
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr "La distingiga adresparto de Äi tiu kolekto. Ordinare ne necesas Äin ÅanÄi."
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr "La malnova pasvorto"
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr "Enigu vian malnovan pasvorton por pruvi, ke Äi tiu konto estas via."
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr "La nova pasvorto"
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "Pasvorto"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr "Äi tiu uzanto jam havas dosieron kun tiu distingiga adresparto."
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
msgid "You are editing another user's media. Proceed with caution."
msgstr "Vi priredaktas dosieron de alia uzanto. Agu singardeme."
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr "Vi aldonis la kundosieron %s!"
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr "Vi povas redakti nur vian propran profilon."
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Vi redaktas profilon de alia uzanto. Agu singardeme."
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr "ProfilÅanÄoj estis konservitaj"
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr "Kontagordoj estis konservitaj"
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr "Vi bezonas konfirmi la forigon de via konto."
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Vi jam havas kolekton kun la nomo «%s»!"
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
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:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr "Vi redaktas kolekton de alia uzanto. Agu singardeme."
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr "MalÄusta pasvorto"
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr "Via pasvorto estas sukcese ÅanÄita"
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr "Alligo de etoso ne eblas⦠ne estas elektita ekzistanta etoso\n"
@@ -300,19 +330,62 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr "Mi pardonpetas, mi ne subtenas tiun dosiertipon :("
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr ""
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr "Malsukcesis transkodado de filmo"
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr "komentis je via afiÅo"
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "Uzantnomo"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "RetpoÅtadreso"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr "Uzantonomo aÅ retpoÅtadreso"
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr "Loko"
@@ -376,7 +449,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr ""
@@ -389,59 +462,209 @@ msgid "Your OAuth clients"
msgstr ""
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr "Aldoni"
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr "Forigi"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "Ensaluti"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr "Ensaluto malsukcesis!"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr "La provizita dosiero ne konformas al la informtipo."
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr "Dosiero"
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr "Vi devas provizi dosieron."
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr "Hura! AlÅutitas!"
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr "Kolekto «%s» aldonitas!"
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr "Konfirmu viecon de la retpoÅtadreso!"
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr "elsaluti"
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr "Ensaluti"
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr "Konto de %(user_name)s"
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr "ÅanÄi kontagordojn"
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -449,16 +672,16 @@ msgstr "ÅanÄi kontagordojn"
msgid "Media processing panel"
msgstr "Kontrolejo pri dosierpreparado."
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr "Elsaluti"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Aldoni dosieron"
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "Krei novan kolekton"
@@ -505,6 +728,59 @@ msgstr "La dek lastaj sukcesaj alÅutoj"
msgid "No processed entries, yet!"
msgstr "AnkoraÅ ne ekzistas eroj prilaboritaj!"
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -537,19 +813,15 @@ msgid ""
"a happy goblin!"
msgstr "Saluton, %(username)s,\n\npor ÅanÄi vian pasvorton Äe GNUa MediaGoblin, sekvu la jenan retadreson per via TTT-legilo:\n\n%(verification_url)s\n\nSe vi pensas, ke Äi tiu retletero estas sendita erare, simple ignoru Äin kaj plu restu feliÄa koboldo!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "Ensaluto malsukcesis!"
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "Äu ankoraÅ sen konto?"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "Kreu Äin Äi tie!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr "Äu vi forgesis vian pasvorton?"
@@ -558,7 +830,7 @@ msgstr "Äu vi forgesis vian pasvorton?"
msgid "Create an account!"
msgstr "Kreu konton!"
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr "Krei"
@@ -592,7 +864,7 @@ msgstr "Disponigita laÅ la permesilo MediaGoblin, eksterordinare bonega programaro por gastigado de aÅdâvidâdosieroj."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
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/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr "Äu vi ankoraÅ ne havas tian? Ne malÄoju!"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
+msgid ""
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
+"\n"
+" Set up MediaGoblin on your own server"
msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
@@ -632,13 +909,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr "Aldoni kundosierojn por %(media_title)s"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr "Kundosieroj"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr "Aldoni kundosieron"
@@ -655,22 +932,29 @@ msgstr "Nuligi"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "Konservi ÅanÄojn"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
-msgstr "ÅanÄado de pasvorto de %(username)s"
+msgid "Changing %(username)s's email"
+msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr "Konservi"
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr "ÅanÄado de pasvorto de %(username)s"
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -698,14 +982,14 @@ msgstr "Priredaktado de %(media_title)s"
msgid "Changing %(username)s's account settings"
msgstr "ÅanÄado de kontagordoj de %(username)s"
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
-msgstr "ÅanÄi la pasvorton"
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
msgid "Delete my account"
msgstr "Forigi mian konton."
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
@@ -717,6 +1001,36 @@ msgstr "Redaktado de %(collection_title)s"
msgid "Editing %(username)s's profile"
msgstr "Redaktado de lâprofilo de %(username)s'"
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "antaÅ %(formatted_time)s"
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -727,8 +1041,7 @@ 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/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr "ElÅuti"
@@ -752,7 +1065,7 @@ msgid ""
msgstr "Vi povas akiri modernan TTT-legilon, kapablan \n\tsonigi la registraĵon Äe \n\t http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr "originalan dosieron"
@@ -761,6 +1074,10 @@ msgstr "originalan dosieron"
msgid "WebM file (Vorbis codec)"
msgstr "WebMan dosieron (kun Vorbisa kodaĵo)"
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr "Kreita"
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -772,47 +1089,39 @@ msgstr "WebMan dosieron (kun Vorbisa kodaĵo)"
msgid "Image for %(media_title)s"
msgstr "Bildo de «%(media_title)s»"
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr "PDF-dosiero"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr "DeantaÅe"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr "Desupre"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr "Deflanke"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr "ElÅuti la modelon"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr "InformaranÄo"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr "Alto de la objekto"
@@ -831,8 +1140,8 @@ msgid ""
msgstr "Vi povas elÅuti modernan TTT-legilon, kapablan \n montri la filmon, de \n http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
-msgstr "la WebM-dosieron (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
@@ -858,11 +1167,6 @@ msgstr "%(collection_title)s de %(username)s"
msgid "Edit"
msgstr "ÅanÄi"
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr "Forigi"
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -917,29 +1221,22 @@ msgstr "Dosieroj de %(username)s"
msgid "â Browsing media by %(username)s"
msgstr "â ÐÑоÑмоÑÑ Ñайлов полÑзоваÑÐµÐ»Ñ %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr "Aldoni komenton"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr "Aldoni Äi tiun komenton"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "antaÅ %(formatted_time)s"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr "Aldonita"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr "Kreita"
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1098,26 +1395,34 @@ msgstr "Markita per"
msgid "Could not read the image file."
msgstr "Malsukcesis lego de la bildodosiero"
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr "Oj!"
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr "Okazis eraro"
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr ""
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1154,10 +1459,9 @@ msgstr "Komenti"
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
-msgstr "Vi povas uzi por markado la lingvon «Markdown»."
+"You can use Markdown for formatting."
+msgstr ""
#: mediagoblin/user_pages/forms.py:31
msgid "I am sure I want to delete this"
@@ -1179,77 +1483,80 @@ msgstr "-- Elektu --"
msgid "Include a note"
msgstr "Rimarko"
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
-msgstr "komentis je via afiÅo"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
+msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr "Ve, komentado estas malebligita."
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr "Oj, via komento estis malplena."
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr "Via komento estis afiÅita!"
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr "Bonvolu kontroli vian enigitaĵon kaj reprovi."
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr "Necesas elekti aÅ aldoni kolekton"
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "«%s» jam estas en la kolekto «%s»"
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "«%s» estis aldonita al la kolekto «%s»"
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr "Vi forigis la dosieron."
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "La dosiero ne estis forigita, Äar vi ne konfirmis vian certecon per la markilo."
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "Vi estas forigonta dosieron de alia uzanto. Estu singardema."
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr "Vi forigis la dosieron el la kolekto."
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr "La dosiero ne estis forigita, Äar vi ne konfirmis vian certecon per la markilo."
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr "Vi estas forigonta dosieron el kolekto de alia uzanto. Agu singardeme."
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "Vi forigis la kolekton «%s»"
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr "La kolekto ne estis forigita, Äar vi ne konfirmis vian certecon per la markilo."
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
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 c5e50f53b45560f8a971e82a418bf21653067547..85015ad9a49a9bf9bd816beeeac5617c82ab75b7 100644
GIT binary patch
delta 10465
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
delta 5142
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
diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
index 8c2f046f..efb19196 100644
--- a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
@@ -19,9 +19,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-05-27 13:54-0500\n"
-"PO-Revision-Date: 2013-06-02 21:23+0000\n"
-"Last-Translator: larjona \n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 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"
@@ -30,250 +30,280 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "Nombre de usuario"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "Contraseña"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "Dirección de correo electrónico"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Lo sentimos, el registro está deshabilitado en este momento."
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
-msgstr "Nombre de usuario o correo electrónico"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr "Nombre de usuario o email"
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr "Nombre de usuario o correo electrónico inválido."
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr "Este campo no acepta direcciones de correo."
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr "Este campo requiere una dirección de correo."
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "Lo sentimos, el registro está deshabilitado en este momento."
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "Lo sentimos, ya existe un usuario con ese nombre."
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr "Lo sentimos, ya existe un usuario con esa dirección de email."
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "Tu dirección de correo electrónico ha sido verificada. ¡Ahora puedes iniciar sesión, editar tu perfil, y enviar imágenes!"
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "La clave de verificación o la identificación de usuario son incorrectas"
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr "¡Debes iniciar sesión para que podamos saber a quién le enviamos el correo electrónico!"
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr "¡Ya has verificado tu dirección de correo!"
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "Se reenvió tu correo electrónico de verificación."
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr "Si esa dirección de correo (¡sensible a mayúsculas y minúsculas!) está registrada, se ha enviado un correo con instrucciones para cambiar la contraseña."
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr "No se ha podido encontrar a nadie con ese nombre de usuario."
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "Un correo electrónico ha sido enviado con instrucciones sobre cómo cambiar tu contraseña."
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr "No se pudo enviar un correo electrónico de recuperación de contraseñas porque tu nombre de usuario está inactivo o la dirección de su cuenta de correo electrónico no ha sido verificada."
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
msgid "You can now log in using your new password."
msgstr "Ahora tu puedes iniciar sesión usando tu nueva contraseña."
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "TÃtulo"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
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:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr "Puedes usar\n \n Markdown para el formato."
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "Etiquetas"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr "Separa las etiquetas por comas."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr "Ficha"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr "La ficha no puede estar vacÃa"
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr "El tÃtulo de esta parte de la dirección de los contenidos. Por lo general no es necesario cambiar esto."
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr "Licencia"
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr "Bio"
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "Sitio web"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr "La dirección contiene errores"
-#: mediagoblin/edit/forms.py:63
+#: mediagoblin/edit/forms.py:65
+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:67
+msgid "Enable/Disable insite notifications"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:69
msgid "License preference"
msgstr "Preferencias de licencia"
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:75
msgid "This will be your default license on upload forms."
msgstr "Ãsta será tu licencia predeterminada en los formularios de subida."
-#: 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:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr "El tÃtulo no puede estar vacÃo"
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "Descripción de esta colección"
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr "El tÃtulo de la dirección de esta colección. Generalmente no necesitas cambiar esto."
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr "Vieja contraseña"
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr "Escriba la anterior contraseña para demostrar que esta cuenta te pertenece."
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr "Nueva contraseña"
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "Contraseña"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr "Una entrada con esa ficha ya existe para este usuario."
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
msgid "You are editing another user's media. Proceed with caution."
msgstr "Estás editando el contenido de otro usuario. Procede con precaución."
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr "¡Has añadido el adjunto %s!"
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr "Sólo puedes editar tu propio perfil."
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Estás editando un perfil de usuario. Procede con precaución."
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr "Los cambios de perfil fueron salvados"
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr "las configuraciones de cuenta fueron salvadas"
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr "Necesitas confirmar el borrado de tu cuenta."
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "¡Ya tienes una colección llamada \"%s\"!"
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
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:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr "Estás editando la colección de otro usuario/a. Ten cuidado."
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr "Contraseña incorrecta"
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr "Se ha cambiado la contraseña correctamente"
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr "No se puede enlazar al tema... no hay un tema seleccionado\n"
@@ -308,19 +338,62 @@ msgid ""
"domain."
msgstr "No se encuentra la cookie CSRF. Esto suele ser debido a un bloqueador de cookies o similar.
Por favor asegúrate de permitir las cookies para este dominio."
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr "Lo sentidos, No soportamos ese tipo de archivo :("
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr "ha fallado la ejecución de unoconv, comprueba el fichero de registro (log)"
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr "Ha fallado la conversión de vÃdeo"
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr "comentó tu publicación"
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "Nombre de usuario"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "Dirección de correo electrónico"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr "Nombre de usuario o correo electrónico"
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr "Locación"
@@ -384,7 +457,7 @@ msgstr "La URI para redireccionar las aplicaciones, este campo es requer
msgid "This field is required for public clients"
msgstr "Este campo es requerido para los clientes públicos"
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr "¡El cliente {0} ha sido registrado!"
@@ -397,59 +470,209 @@ msgid "Your OAuth clients"
msgstr "Tus clientes OAuth"
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr "Añadir "
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr "Borrar"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "Iniciar sesión"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr "¡Hubo un fallo al iniciar sesión!"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr "Archivo inválido para el formato seleccionado."
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr "Archivo"
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr "Debes proporcionar un archivo."
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr "¡Yuju! ¡Enviado!"
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr "¡Colección \"%s\" añadida!"
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr "¡Verifica tu email!"
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr "cerrar sesión"
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: 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 "Iniciar sesión"
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr "Cuenta de %(user_name)s"
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr "Cambiar la configuración de la cuenta"
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -457,16 +680,16 @@ msgstr "Cambiar la configuración de la cuenta"
msgid "Media processing panel"
msgstr "Panel de procesamiento de contenido"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr "Cerrar sesión"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Añadir contenido"
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "Crear nueva colección"
@@ -513,6 +736,59 @@ msgstr "Ãltimos 10 envÃos con éxito"
msgid "No processed entries, yet!"
msgstr "¡Aún no hay entradas procesadas!"
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -545,19 +821,15 @@ msgid ""
"a happy goblin!"
msgstr "Hola %(username)s,\n\nPara cambiar tu contraseña de GNU MediaGoblin, abre la siguiente URL en un navegador:\n\n%(verification_url)s \n\nSi piensas que esto es un error, simplemente ignora este mensaje y sigue siendo un duende feliz."
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "¡Hubo un fallo al iniciar sesión!"
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "¿No tienes una cuenta?"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "¡Crea una aquÃ!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr "¿Olvidaste tu contraseña?"
@@ -566,7 +838,7 @@ msgstr "¿Olvidaste tu contraseña?"
msgid "Create an account!"
msgstr "¡Crea una cuenta!"
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr "Crear"
@@ -600,7 +872,7 @@ msgstr "Publicado bajo la MediaGoblin, un extraordinario programa libre para alojar, gestionar y compartir contenido multimedia."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
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/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr "¿Aún no tienes una? ¡Es fácil!"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
+msgid ""
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "Crear una cuenta en este sitio\n o\n Instalar MediaGoblin en tu propio servidor"
+"\n"
+" Set up MediaGoblin on your own server"
+msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
@@ -640,13 +917,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr "Editando archivos adjuntos a %(media_title)s"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr "Adjuntos"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr "Agregar adjunto"
@@ -663,22 +940,29 @@ msgstr "Cancelar"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "Guardar cambios"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
-msgstr "Cambiando la contraseña de %(username)s"
+msgid "Changing %(username)s's email"
+msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr "Guardar"
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr "Cambiando la contraseña de %(username)s"
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -706,14 +990,14 @@ msgstr "Editando %(media_title)s "
msgid "Changing %(username)s's account settings"
msgstr "Cambio de %(username)s la configuración de la cuenta "
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
-msgstr "Cambiar tu contraseña."
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
msgid "Delete my account"
msgstr "Borrar mi cuenta"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
@@ -725,6 +1009,36 @@ msgstr "Editando %(collection_title)s"
msgid "Editing %(username)s's profile"
msgstr "Editando el perfil de %(username)s"
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "hace %(formatted_time)s"
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -735,8 +1049,7 @@ 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/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr "Descargar"
@@ -760,7 +1073,7 @@ msgid ""
msgstr "Tú puedes obtener un navegador más moderno que \n\tpueda reproducir el audio \n\t http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr "Archivo original"
@@ -769,6 +1082,10 @@ msgstr "Archivo original"
msgid "WebM file (Vorbis codec)"
msgstr "Archivo WebM (códec Vorbis)"
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr "Creado"
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -780,47 +1097,39 @@ msgstr "Archivo WebM (códec Vorbis)"
msgid "Image for %(media_title)s"
msgstr "Imágenes para %(media_title)s"
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr "Fichero PDF"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr "Alternar Rotar"
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr "Perspectiva"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr "Frente"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr "Arriba"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr "Lateral"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr "WebGL"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr "Descargar modelo"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr "Formato de Archivo"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr "Altura del Objeto"
@@ -839,8 +1148,8 @@ msgid ""
msgstr "¡Puedes conseguir un navegador moderno \n que pueda reproducir este vÃdeo en \n http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
-msgstr "Archivo WebM (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
@@ -866,11 +1175,6 @@ msgstr "%(collection_title)s por %(username)s"
msgid "Edit"
msgstr "Editar"
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr "Borrar"
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -925,29 +1229,22 @@ msgstr "Contenido de %(username)s"
msgid "â Browsing media by %(username)s"
msgstr "â Explorando contenido de %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr "Añadir un comentario"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr "Añade un comentario "
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "hace %(formatted_time)s"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr "Agregado"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr "Creado"
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1106,26 +1403,34 @@ msgstr "Marcado con"
msgid "Could not read the image file."
msgstr "No se pudo leer el archivo de imagen."
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr "¡Ups!"
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr "Ha ocurrido un error"
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr "Operación no permitida"
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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 "¡Lo siento Dave, no puedo permitir que hagas eso!
Has intentado realizar una operación no permitida. ¿Has vuelto a intentar borrar todas las cuentas de usuario?"
-#: mediagoblin/tools/response.py:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1162,10 +1467,9 @@ msgstr "Comentario"
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
-msgstr "Puedes usar Markdown para el formato."
+"You can use Markdown for formatting."
+msgstr ""
#: mediagoblin/user_pages/forms.py:31
msgid "I am sure I want to delete this"
@@ -1187,77 +1491,80 @@ msgstr "-- Selecciona --"
msgid "Include a note"
msgstr "Incluir una nota"
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
-msgstr "comentó tu publicación"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
+msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr "Lo siento, los comentarios están desactivados."
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr "Ups, tu comentario estaba vacÃo."
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr "¡Tu comentario ha sido publicado!"
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr "Por favor, revisa tus entradas e inténtalo de nuevo."
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr "Tienes que seleccionar o añadir una colección"
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "%s\" ya está en la colección \"%s\""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "\"%s\" añadido a la colección \"%s\""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr "Eliminaste el contenido"
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "El contenido no se eliminó porque no marcaste que estabas seguro."
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "Estás a punto de eliminar un contenido de otro usuario. Procede con precaución."
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr "Borraste el Ãtem de la colección."
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr "El Ãtem no fue removido porque no confirmaste que estuvieras seguro/a."
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr "Estás a punto de borrar un Ãtem de la colección de otro usuario. Procede con cuidado."
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "Borraste la colección \"%s\""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr "La colección no fue borrada porque no confirmaste que estuvieras seguro/a."
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr "Estás a punto de borrar la colección de otro usuario. Procede con cuidado."
diff --git a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo
index 3422ad979e1993332f2f17acc88b7fba2178ed71..028c52ba1e6cfa8516953e96bff9197d6b0dadf6 100644
GIT binary patch
literal 31294
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
diff --git a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po
index 08e73e1a..cdd0844c 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: 2013-05-27 13:54-0500\n"
-"PO-Revision-Date: 2013-05-27 18:54+0000\n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: Persian (http://www.transifex.com/projects/p/mediagoblin/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -19,250 +19,280 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "ÙØ§Ù
کاربرÛ"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "Ú¯Ø°Ø±ÙØ§Ù°ÚÙ"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "آدرس اÛÙ
ÛÙ"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Ù
ØªØ§Ø³ÙØ§ÙÙØØ«Ø¨ØªÙØ§Ù
Ø¨Ù Ø·ÙØ± Ù
ÙÙØª ØºÛØ± ÙØ¹Ø§Ù است."
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr ""
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr ""
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr ""
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr ""
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "Ù
ØªØ§Ø³ÙØ§ÙÙØØ«Ø¨ØªÙØ§Ù
Ø¨Ù Ø·ÙØ± Ù
ÙÙØª ØºÛØ± ÙØ¹Ø§Ù است."
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "Ù
ØªØ§Ø³ÙØ§ÙÙ Ú©Ø§Ø±Ø¨Ø±Û Ø¨Ø§ اÛÙ ÙØ§Ù
Ú©Ø§Ø±Ø¨Ø±Û ÙØ¬Ùد دارد."
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr ""
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "اÛÙ
ÛÙ Ø´Ù
ا تاÛÛØ¯ شد.Ø´Ù
ا Ù
Û ØªÙØ§ÙÛØ¯ ØØ§Ùا ÙØ§Ø±Ø¯ Ø´ÙÛØ¯ØÙÙ
اÛÙ Ø®ÙØ¯ را ÙÛØ±Ø§ÛØ´ Ú©ÙÛØ¯ ٠تصاÙÛØ± Ø®ÙØ¯ را ثبت Ú©ÙÛØ¯!"
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "اÛ٠کد تاÛÛØ¯ÛÙ ÛØ§ Ø´ÙØ§Ø³Ù Ú©Ø§Ø±Ø¨Ø±Û ØµØÛØ ÙÛØ³Øª."
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr ""
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr ""
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "اÛÙ
Û٠تاÛÛØ¯Û٠باز ارسا٠شد."
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr ""
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "عÙÙØ§Ù"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr ""
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr ""
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "Ø¨Ø±ÚØ³Ø¨"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr ""
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr ""
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr "Ø²ÙØ¯Ú¯ÛÙØ§Ù
Ù"
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "ÙØ¨Ø³Ø§Ûت"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr ""
-#: mediagoblin/edit/forms.py:63
-msgid "License preference"
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
msgstr ""
#: mediagoblin/edit/forms.py:69
-msgid "This will be your default license on upload forms."
+msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
+#: mediagoblin/edit/forms.py:75
+msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr ""
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr ""
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr ""
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "Ú¯Ø°Ø±ÙØ§Ù°ÚÙ"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
msgid "You are editing another user's media. Proceed with caution."
msgstr "Ø´Ù
ا در ØØ§Ù ÙÛØ±Ø§ÛØ´ رساÙ٠کاربر دÛÚ¯Ø±Û ÙØ³ØªÛد.با Ø§ØØªÛاط عÙ
Ù Ú©ÙÛØ¯"
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr ""
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr ""
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Ø´Ù
ا در ØØ§Ù ÙÛØ±Ø§ÛØ´ ÙÙ
اÛ٠کاربر دÛÚ¯Ø±Û ÙØ³ØªÛد.با Ø§ØØªÛاط عÙ
Ù Ú©ÙÛØ¯."
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr ""
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr ""
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr ""
@@ -297,19 +327,62 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr ""
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr ""
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr ""
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "ÙØ§Ù
کاربرÛ"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "آدرس اÛÙ
ÛÙ"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr ""
@@ -373,7 +446,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr ""
@@ -386,59 +459,209 @@ msgid "Your OAuth clients"
msgstr ""
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr ""
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "ÙØ±Ùد"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr "ÙØ±Ùد با خطا Ø§ÙØ¬Ø§Ù
شد!"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr "ÙØ§ÛÙÛ ÙØ§ Ù
عتبر Ø¨Ø±Ø§Û ÙÙØ¹ رساÙ٠داد٠شدÙ."
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr "ÙØ§ÛÙ"
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr "Ø´Ù
ا Ø¨Ø§ÛØ¯ ÙØ§ÛÙÛ Ø§Ø±Ø§Ù٠بدÙÛØ¯."
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr "ÙÙØ±Ø§!ثبت شد!"
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr "ÙØ±Ùد"
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -446,16 +669,16 @@ msgstr ""
msgid "Media processing panel"
msgstr "Ù¾ÙÙ Ø±Ø³ÛØ¯Ú¯Û ب٠رساÙÙ ÙØ§"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
@@ -502,6 +725,59 @@ msgstr ""
msgid "No processed entries, yet!"
msgstr ""
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -534,19 +810,15 @@ msgid ""
"a happy goblin!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "ÙØ±Ùد با خطا Ø§ÙØ¬Ø§Ù
شد!"
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "Ø¢ÛØ§ ØØ³Ø§Ø¨ Ú©Ø§Ø±Ø¨Ø±Û ÙØ¯Ø§Ø±ÛدØ"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "در اÛÙØ¬Ø§ ÛÚ©Û Ø¨Ø³Ø§Ø²ÛØ¯!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr ""
@@ -555,7 +827,7 @@ msgstr ""
msgid "Create an account!"
msgstr "ساخت ÛÚ© ØØ³Ø§Ø¨ کاربرÛ!"
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr "ساختÙ"
@@ -589,7 +861,7 @@ msgstr ""
msgid "Explore"
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr ""
@@ -599,22 +871,27 @@ msgid ""
"extraordinarily great piece of media hosting software."
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
+msgid ""
+"\n"
+" >Create an account at this site
\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
+"\n"
+" Set up MediaGoblin on your own server"
msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
@@ -629,13 +906,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr ""
@@ -652,22 +929,29 @@ msgstr "Ø§ÙØµØ±Ø§Ù"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "Ø°Ø®ÛØ±Ù تغÛÛØ±Ø§Øª"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
+msgid "Changing %(username)s's email"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -695,12 +979,12 @@ msgstr "ÙÛØ±Ø§ÛØ´ %(media_title)s"
msgid "Changing %(username)s's account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
+msgid "Delete my account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
-msgid "Delete my account"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
@@ -714,6 +998,36 @@ msgstr ""
msgid "Editing %(username)s's profile"
msgstr "در ØØ§Ù ÙÛØ±Ø§ÛØ´ ÙÙ
اÛÙ %(username)s"
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -724,8 +1038,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr ""
@@ -749,7 +1062,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr ""
@@ -758,6 +1071,10 @@ msgstr ""
msgid "WebM file (Vorbis codec)"
msgstr ""
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -769,47 +1086,39 @@ msgstr ""
msgid "Image for %(media_title)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr ""
@@ -828,7 +1137,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
@@ -855,11 +1164,6 @@ msgstr ""
msgid "Edit"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -914,29 +1218,22 @@ msgstr "%(username)s's رساÙÙ ÙØ§Û"
msgid "â Browsing media by %(username)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1095,26 +1392,34 @@ msgstr ""
msgid "Could not read the image file."
msgstr ""
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr "اÙÙ"
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr ""
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr ""
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1151,9 +1456,8 @@ msgstr ""
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
+"You can use Markdown for formatting."
msgstr ""
#: mediagoblin/user_pages/forms.py:31
@@ -1176,77 +1480,80 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr ""
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr ""
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr ""
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr ""
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr ""
diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo
index 7bc860a0fd5b08527090f0b09bf279bdfbdfee9f..034a3ddeda1a3ccebe82475b84c963d0fd8e9aa5 100644
GIT binary patch
delta 10440
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
SZ_{*rc~c7Q<2r52xqks{(J>tW
diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po
index 6103c439..7ce92b58 100644
--- a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-05-27 13:54-0500\n"
-"PO-Revision-Date: 2013-05-27 18:54+0000\n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 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"
@@ -28,250 +28,280 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "Nom d'utilisateur"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "Mot de passe"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "Adresse e-mail"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "L'inscription n'est pas activée sur ce serveur, désolé."
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr "Nom d'utilisateur ou email"
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr "Nom d'utilisateur ou adresse de courriel invalide."
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr ""
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr ""
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "L'inscription n'est pas activée sur ce serveur, désolé."
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "Un utilisateur existe déjà avec ce nom, désolé."
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr "Désolé, il existe déjà un utilisateur ayant cette adresse e-mail."
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "Votre adresse e-mail a bien été vérifiée. Vous pouvez maintenant vous identifier, modifier votre profil, et soumettre des images !"
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "La clé de vérification ou le nom d'utilisateur est incorrect."
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr "Vous devez être authentifié afin que nous sachions à qui envoyer l'e-mail !"
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr "Votre adresse e-mail a déjà été vérifiée !"
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "E-mail de vérification renvoyé."
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr "Nom d'utilisateur introuvable."
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "Un email contenant les instructions pour changer votre mot de passe viens de vous être envoyé"
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr "Impossible d'envoyer un email de récupération de mot de passe : votre compte est inactif ou bien l'email de votre compte n'a pas été vérifiée."
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
msgid "You can now log in using your new password."
msgstr "Vous pouvez maintenant vous connecter avec votre nouveau mot de passe."
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "Titre"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr "Descriptif pour ce travail"
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr "Vous pouvez utiliser\n \n Markdown pour le formattage."
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "Tags"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr "Séparez les champs avec des virgules."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr "Légende"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr "La légende ne peut pas être laissée vide."
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
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/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr "Licence"
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr "Bio"
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "Site web"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr "Cette adresse contiens des erreurs"
-#: mediagoblin/edit/forms.py:63
-msgid "License preference"
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr "Me prévenir par email lorsque d'autres commentent mes médias"
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
msgstr ""
#: mediagoblin/edit/forms.py:69
-msgid "This will be your default license on upload forms."
+msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
-msgstr "Me prévenir par email lorsque d'autres commentent mes médias"
+#: mediagoblin/edit/forms.py:75
+msgid "This will be your default license on upload forms."
+msgstr ""
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr "Le titre ne peut être vide"
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "Description de cette collection"
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr "Le titre affiché dans l'URL de la collection. Vous n'avez généralement pas besoin d'y toucher."
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr "Ancien mot de passe."
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr "Entrez votre ancien mot de passe pour prouver que vous êtes bien le propriétaire de ce compte."
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr "Nouveau mot de passe"
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "Mot de passe"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr "Une entrée existe déjà pour cet utilisateur avec la même légende."
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
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:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr "Vous avez ajouté la pièce jointe %s !"
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr "Vous ne pouvez modifier que votre propre profil."
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
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:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr "Les changements apportés au profile ont étés sauvegardés"
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr "Les changements des préférences du compte ont étés sauvegardés"
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr "Vous devez confirmer la suppression de votre compte."
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Vous avez déjà une collection appelée \"%s\" !"
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr "Vous éditez la collection d'un autre utilisateurs. Faites attention."
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr "Mauvais mot de passe"
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr ""
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr "Impossible de lier le thème... Aucun thème associé\n"
@@ -306,19 +336,62 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr "Désolé, mais je ne prends pas en charge cette extension de fichier :("
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr ""
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr "L'encodage de la vidéo à échoué"
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr "a commenté votre post"
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "Adresse e-mail"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr "Position"
@@ -382,7 +455,7 @@ msgstr "L'URI de redirection pour l'application, ce champ est requis%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr "Changer les paramètres du compte"
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -455,16 +678,16 @@ msgstr "Changer les paramètres du compte"
msgid "Media processing panel"
msgstr "Panneau pour le traitement des médias"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Ajouter des médias"
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "Créer une nouvelle collection"
@@ -511,6 +734,59 @@ msgstr "10 derniers envois terminés"
msgid "No processed entries, yet!"
msgstr "Aucune entrée traitée jusqu'à présent !"
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -543,19 +819,15 @@ msgid ""
"a happy goblin!"
msgstr "Bonjour %(username)s,\n\nPour changer votre mot de passe GNU MediaGoblin, ouvrez l'URL suivante dans \nvotre navigateur internet :\n\n%(verification_url)s\n\nSi vous pensez qu'il s'agit d'une erreur, ignorez simplement cet email et restez\nun goblin heureux !"
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "La connexion a échoué!"
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "Pas encore de compte ?"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "Créez-en un ici !"
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr "Vous avez oublié votre mot de passe ?"
@@ -564,7 +836,7 @@ msgstr "Vous avez oublié votre mot de passe ?"
msgid "Create an account!"
msgstr "Créer un compte !"
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr "Créer"
@@ -598,7 +870,7 @@ msgstr "Disponible sous la licence MediaGoblin, un logiciel d'hébergement de média extraordinairement génial."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr "Pour ajouter vos propres médias, commenter, et bien plus encore, vous pouvez vous connecter avec votre compte MediaGoblin"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr "Vous n'en avez pas ? C'est facile !"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
+msgid ""
+"\n"
+" Set up MediaGoblin on your own server"
msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
@@ -638,13 +915,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr "Ãditer les pièces jointes de %(media_title)s"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr "Pièces jointes"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr "Ajouter une pièce jointe"
@@ -661,22 +938,29 @@ msgstr "Annuler"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "Enregistrer les modifications"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
+msgid "Changing %(username)s's email"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -704,12 +988,12 @@ msgstr "Modification de %(media_title)s"
msgid "Changing %(username)s's account settings"
msgstr "Changement des préférences du compte de %(username)s"
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
+msgid "Delete my account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
-msgid "Delete my account"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
@@ -723,6 +1007,36 @@ msgstr "Modification de %(collection_title)s"
msgid "Editing %(username)s's profile"
msgstr "Modification du profil de %(username)s"
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -733,8 +1047,7 @@ 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/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr "Télécharger"
@@ -758,7 +1071,7 @@ msgid ""
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/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr "Fichier original"
@@ -767,6 +1080,10 @@ msgstr "Fichier original"
msgid "WebM file (Vorbis codec)"
msgstr "fichier WebM (codec Vorbis)"
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -778,47 +1095,39 @@ msgstr "fichier WebM (codec Vorbis)"
msgid "Image for %(media_title)s"
msgstr "Image de %(media_title)s"
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr ""
@@ -837,8 +1146,8 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
-msgstr "fichier WebM (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
@@ -864,11 +1173,6 @@ msgstr "%(collection_title)s de %(username)s"
msgid "Edit"
msgstr "Ãditer"
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr "Effacer"
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -923,29 +1227,22 @@ msgstr "Médias de %(username)s"
msgid "â Browsing media by %(username)s"
msgstr "â Parcourir les médias de %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr "Ajouter un commentaire"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr "Ajouter ce commentaire"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1104,26 +1401,34 @@ msgstr "Taggé avec"
msgid "Could not read the image file."
msgstr "Impossible de lire l'image."
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr "Zut !"
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr "Une erreur est survenue"
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr "Opération non autorisée"
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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 "Je regrette Dave, cela m'est malheureusement impossible !
Vous avez essayé d'effectuer une action pour laquelle vous n'avez pas de permission. Avez-vous tenté de supprimer tous les comptes utilisateur à nouveau ?"
-#: mediagoblin/tools/response.py:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1160,10 +1465,9 @@ msgstr ""
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
-msgstr "Vous pouvez utilisez les Balises pour la mise en page."
+"You can use Markdown for formatting."
+msgstr ""
#: mediagoblin/user_pages/forms.py:31
msgid "I am sure I want to delete this"
@@ -1185,77 +1489,80 @@ msgstr "-- Sélectionner --"
msgid "Include a note"
msgstr "Inclure une note"
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
-msgstr "a commenté votre post"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
+msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr ""
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr "Oups, votre commentaire était vide."
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr "Votre commentaire a été posté !"
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr "Veuillez vérifier vos entrées et réessayer."
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr "Vous devez sélectionner ou ajouter une collection"
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "\"%s\" est déjà dans la collection \"%s\""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "\"%s\" as été ajouté à la collection \"%s\""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr "Vous avez supprimé le media."
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "Ce media n'a pas été supprimé car vous n'avez pas confirmer que vous étiez sur."
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "Vous êtes sur le point de supprimer des médias d'un autre utilisateur. Procédez avec prudence."
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr "Vous avez supprimé cet élément de la collection."
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr "L'élément n'as pas été supprimé car vous n'avez pas confirmé votre certitude."
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
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:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "Vous avez supprimé la collection \"%s\""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr "La collection n'as pas été supprimée car vous n'avez pas confirmé votre certitude"
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
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
index 09412b0a9eb53eef86fcacccb355d6cd1d30fd4f..205fe4be01fce80fee4f8adaa8b8f631256e8acd 100644
GIT binary patch
delta 10556
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
diff --git a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po
index 4a5c2b52..7925c1a2 100644
--- a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/he/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: 2013-05-27 13:54-0500\n"
-"PO-Revision-Date: 2013-06-01 07:11+0000\n"
-"Last-Translator: GenghisKhan \n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 19:18+0000\n"
+"Last-Translator: cwebber \n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/mediagoblin/language/he/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,250 +21,280 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "×©× ×שת×ש"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "ס×ס××"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "×ת××ת ××××´×"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "צר ××, ר×ש×× ××× × ×× ×××¨× ×¢× ×©×¨×ª ××."
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
-msgstr "×©× ×שת×ש ×× ××××´×"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr "×©× ×שת×ש ×× ××××´×"
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr "×©× ×שת×ש ×× ××××´× ×©×××."
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr "ש×× ×× ×× ×××§× ×ת×××ת ××××´×."
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr "ש×× ×× ×צר×× ×ת××ת ××××´×."
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "צר ××, ר×ש×× ××× × ×× ×××¨× ×¢× ×©×¨×ª ××."
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "צר ××, ×שת×ש ×¢× ×©× ×× ××ר ×§×××."
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr "צר ××, ×שת×ש ×¢× ××××´× ×× ××ר ×§×××."
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "×ת××ת ×××××´× ×©×× ×××ת×. ×עת ××פשר××ª× ××ת××ר, ×ער×× ×ת ××××§× ×, ××ש××× ×ª××× ×ת!"
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "××¤×ª× ×××××ת ×× ×××ת ×שת×ש ××× × ×©×××××"
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr "×¢××× ××ת××ר ×¢× ×× ×ª ×©× ××¢ ×× ×× ×ש××× ×ת ×××××´×!"
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr "××ר ×××תת ×ת ×ת××ת ×××××´× ×©××!"
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "ש×× ×©×× ×ת ××××´× ×××××ת ש××."
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr "××××× ××ת××ת ×××××´× ××× (ת××× ×¨×ש××ת!) רש××× ××××´× × ×©×× ×¢× ××ר××ת ×× ×××¢ ××××¦× ××©× ×ת ×ת ס×ס×ת×."
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr "×× ××× × ××ª× ××צ×× ××ש×× ×¢× ×©× ×שת×ש ××."
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "××××´× × ×©×× ×צ×ר××£ ××ר××ת ×× ×××¢ ××××¦× × ××ª× ××©× ×ת ×ת ס×ס×ת×."
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr "×× ××× × ××ª× ×ש××× ××××´× ×ש×××ר ס×ס×× ×××ר ××©× ××שת×ש ש×× ××× × ×¤×¢×× ×× ×©×ת××ת ×××××´× ×©× ×ש××× × ×× ×××ת×."
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
msgid "You can now log in using your new password."
msgstr "×עת ××××××ª× ××ת××ר ×××צע×ת ס×ס××ª× ×××ש×."
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "××תרת"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr "ת×××ר ×©× ××××× ××"
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr "××××××ª× ××שת×ש ×ת×××ר\n \n Markdown ××¢×צ××."
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "ת×××ת"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr "××¤×¨× ×ª×××ת ××¢×רת פס××§××."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr "×ש×פ×ת"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr "××ש×פ×ת ×× ××××× ××××ת ר××§×"
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr "×××ר ×××תרת ×©× ×ת××ת ×××× ××. ×ר×× ××× ×××¨× ××©× ×ת ×ת ×××§ ××."
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr "רש×××"
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr "×××"
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "×תר רשת"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr "×ת××ת ×× ××××× ×©××××ת"
-#: mediagoblin/edit/forms.py:63
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr "ש×× ×× ××××´× ××שר ××ר×× ×××××× ×¢× ××××× ×©××"
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:69
msgid "License preference"
msgstr "×¢××פ×ת רש×××"
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:75
msgid "This will be your default license on upload forms."
msgstr "×× ×××× ×רש×××× ××שת×× (×ר×רת ××××) ש×× ××××¤×¡× ××¢×××."
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
-msgstr "ש×× ×× ××××´× ××שר ××ר×× ×××××× ×¢× ××××× ×©××"
-
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr "×××תרת ×× ××××× ××××ת ר××§×"
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "ת×××ר ××סף ××"
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr "×××ר ×××תרת ×©× ×ת××ת ××סף ××. ×ר×× ××× ×××¨× ××©× ×ת ×ת ×××§ ××."
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr "ס×ס×× ××©× ×"
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr "××× ×ת ס×ס××ª× ×××©× × ××× ×××××× ×©××ª× ×××¢××× ×©× ×ש××× ××."
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr "ס×ס×× ××ש×"
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "ס×ס××"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr "רש××× ×¢× ×ש×פ×ת ×× ××ר ×§×××ת ×¢××ר ×שת×ש ××."
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
msgid "You are editing another user's media. Proceed with caution."
msgstr "××ª× ×¢××¨× ×××× ×©× ×שת×ש ××ר. ×××©× ××××ר×ת."
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr "××ספת ×ת ×תצר××£ %s!"
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr "××פשר××ª× ×ער×× ×¨×§ ×ת ×××××§× ×©××."
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
msgid "You are editing a user's profile. Proceed with caution."
msgstr "××ª× ×¢××¨× ××××§× ×©× ×שת×ש. ×××©× ××××ר×ת."
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr "ש×× ××× ××××§× × ×©×ר×"
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr "×××ר×ת ×ש××× × ×©×ר×"
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr "×¢××× ×××ת ×ת ×××××§× ×©× ×ש××× ×."
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "××ר ×ש ×× ××סף שקר×× ××©× \"%s\"!"
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr "××סף ×¢× ×ש×פ×ת ×× ××ר ×§××× ×¢××ר ×שת×ש ××."
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr "××ª× ×¢××¨× ××סף ×©× ×שת×ש ××ר. ×××©× ××××ר×ת."
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr "ס×ס×× ×©××××"
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr "ס×ס××ª× ×©×× ×ª× ××צ×××"
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr "×× × ××ª× ×קשר ×× ×××××... ×× ××××ר ×××××\n"
@@ -299,19 +329,62 @@ msgid ""
"domain."
msgstr "×¢××××ת CSRF ×× × ×××ת. ×× ×§×¨×× ×××××× × ×××¢ ×ש×× ×××¡× ×¢××××× ×× ×ש×× ×ס×× ××.
×××× ×§×××¢× ×©× ×¢××××ת ×¢××ר ת××× ××."
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr "צר ××, ××× × × ×ª××× ×××פ×ס ×§×××¥ ×× :("
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr "unoconv × ××©× ×פע××, ××××§ ×§×××¥ ××××"
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr "××רת ××××× × ×ש××"
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr "××××/× ×¢× ×¤×¨×¡×××"
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "×©× ×שת×ש"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "×ת××ת ××××´×"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr "×©× ×שת×ש ×× ××××´×"
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr "×××§××"
@@ -375,7 +448,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr "ש×× ×× ××× × ×ר×ש ×¢××ר ××§×××ת פ××××××"
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr "×××§×× {0} × ×¨×©×!"
@@ -388,59 +461,209 @@ msgid "Your OAuth clients"
msgstr "××§×××ת OAuth ש××"
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr "××סף"
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr "×××§"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "×ת××ר×ת"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr "×ת××ר×ת × ×ש××!"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr "× ××ª× ×§×××¥ ש××× ×¢××ר ××פ×ס ××××."
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr "×§×××¥"
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr "×¢××× ×ספק ×§×××¥."
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr "××××! × ×©××!"
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr "××סף \"%s\" ×ת××סף!"
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr "××ת ×ת ×××××´× ×©××!"
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr "××ª× ×ª×§×ת"
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr "×ת××ר×ת"
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr "××ש××× ×©× %(user_name)s"
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr "×©× × ×××ר×ת ×ש×××"
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -448,16 +671,16 @@ msgstr "×©× × ×××ר×ת ×ש×××"
msgid "Media processing panel"
msgstr "××× ×¢×××× ××××"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr "××ª× ×ª×§×ת"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "××ספת ××××"
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "צ×ר ××סף ××ש"
@@ -504,6 +727,59 @@ msgstr "10 ××¢×××ת ××צ×××ת ××ר×× ×ת"
msgid "No processed entries, yet!"
msgstr "××× ×¨×ש×××× ××¢×××××, ×¢××××!"
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -536,19 +812,15 @@ msgid ""
"a happy goblin!"
msgstr "ש××× %(username)s,\n\n×××× ××©× ×ת ×ת ס×ס××ª× ××¦× GNU MediaGoblin, ×¢××× ×פת×× ×ת ××ת××ת ×××× \n×ת×× ×פ××¤× ×רשת ש××:\n\n%(verification_url)s\n\n××××× ×××ª× ×××©× ×©××××ר ×ש××××, פש×× ×תע×× ×× ××××´× ×× ××××©× ××××ת\n×××××× ×××שר!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "×ת××ר×ת × ×ש××!"
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "××× ×× ×ש××× ×¢××××?"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "צ×ר ×ש××× ×××!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr "ש××ת ×ת ס×ס×ת×?"
@@ -557,7 +829,7 @@ msgstr "ש××ת ×ת ס×ס×ת×?"
msgid "Create an account!"
msgstr "צ×ר ×ש×××!"
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr "צ×ר"
@@ -591,7 +863,7 @@ msgstr "×ש××רר ת×ת ×רש××× MediaGoblin, ×ת××ת ת××× ×ª ××ר×× ×××× ××צ×ת ×× ××××."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr "×××× ×××ס××£ ×ת ××××× ×©××, ××ש×× ×ª××××ת, ××¢××, ××××××ª× ××ת××ר ×¢× ×ש××× MediaGoblin."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr "××× ×רש××ª× ×ש××× ×¢××××? ×× ×§×!"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
+msgid ""
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "צ×ר ×ש××× ××תר ××\n ××\n ××ª×§× ×ת MediaGoblin ×¢× ×©×¨×ª×"
+"\n"
+" Set up MediaGoblin on your own server"
+msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
@@ -631,13 +908,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr "ער××ת תצר×פ×× ×¢××ר %(media_title)s"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr "תצר×פ××"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr "××ספת תצר××£"
@@ -654,22 +931,29 @@ msgstr "×××××"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "ש××ר ש×× ××××"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
-msgstr "××©× × ×עת ×ת ×ס×ס×× ×©× %(username)s'"
+msgid "Changing %(username)s's email"
+msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr "ש××ר"
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr "××©× × ×עת ×ת ×ס×ס×× ×©× %(username)s'"
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -697,14 +981,14 @@ msgstr "ער×× %(media_title)s"
msgid "Changing %(username)s's account settings"
msgstr "ש×× ×× ×××ר×ת ×ש××× ×¢××ר %(username)s"
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
-msgstr "×©× × ×ת ס×ס×ת×."
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
msgid "Delete my account"
msgstr "×××§ ×ת ××ש××× ×©××"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
@@ -716,6 +1000,36 @@ msgstr "ער××ת %(collection_title)s"
msgid "Editing %(username)s's profile"
msgstr "ער××ת ××××§× ×¢××ר %(username)s"
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "×××¤× × %(formatted_time)s"
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -726,8 +1040,7 @@ 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/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr "××ר×"
@@ -751,7 +1064,7 @@ msgid ""
msgstr "××××××ª× ××ש×× ×פ××¤× ×¨×©×ª ××××¨× × \n\tש×× ×ס××× ×× ×× ×ת ××××× ×× ××¦× \n\t http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr "×§×××¥ ××§×ר×"
@@ -760,6 +1073,10 @@ msgstr "×§×××¥ ××§×ר×"
msgid "WebM file (Vorbis codec)"
msgstr "×§×××¥ WebM (×§×××§ Vorbis)"
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr "× ×צר"
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -771,47 +1088,39 @@ msgstr "×§×××¥ WebM (×§×××§ Vorbis)"
msgid "Image for %(media_title)s"
msgstr "ת××× × ×¢××ר %(media_title)s"
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr "×§×××¥ PDF"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr "××××£ ס××××"
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr "× ×§××ת ×××"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr "××¤× ××"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr "ר×ש"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr "צ×"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr "×××¨× ××××"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr "פ×ר×× ×§×××¥"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr "×××× ××××××§×"
@@ -830,8 +1139,8 @@ msgid ""
msgstr "××××××ª× ××ש×× ×פ××¤× ×¨×©×ª ××××¨× × \n ש×× ×ס××× ×× ×× ×ת ××××× ×× ××¦× \n http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
-msgstr "×§×××¥ WebM â«(640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
@@ -857,11 +1166,6 @@ msgstr "%(collection_title)s ××ת %(username)s"
msgid "Edit"
msgstr "ער××"
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr "×××§"
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -916,29 +1220,22 @@ msgstr "××××× ×©× %(username)s"
msgid "â Browsing media by %(username)s"
msgstr "â ×¢××× ××××× ××ת %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr "××סף ת××××"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr "××סף ×ת ת×××× ××"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "×××¤× × %(formatted_time)s"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr "×ת××סף"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr "× ×צר"
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1097,26 +1394,34 @@ msgstr "×ת×××ת ×¢×"
msgid "Could not read the image file."
msgstr "×× ××× × ××ª× ×קר×× ×ת ×§×××¥ ×ת××× ×."
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr "××פס!"
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr "×××¨×¢× ×©××××"
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr "פע××× ×× ××רש×ת"
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1153,10 +1458,9 @@ msgstr "ת××××"
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
-msgstr "××××××ª× ×עש×ת ש×××ש ×ת×××ר Markdown ××¢×צ××."
+"You can use Markdown for formatting."
+msgstr ""
#: mediagoblin/user_pages/forms.py:31
msgid "I am sure I want to delete this"
@@ -1178,77 +1482,80 @@ msgstr "-- ××ר --"
msgid "Include a note"
msgstr "××××ת פתק"
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
-msgstr "××××/× ×¢× ×¤×¨×¡×××"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
+msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr "×צ×ער××, ת××××ת ×× ××ר××ת."
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr "××פס, ת××××ª× ×××ª× ×¨××§×."
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr "ת××××ª× ×¤×רס××!"
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr "×× × ××××§ ×ת רש×××ת×× ×× ×¡× ×©××."
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr "×¢××× ××××ר ×× ×××ס××£ ××סף"
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "\"%s\" ××ר ×§××× ×××סף \"%s\""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "\"%s\" ×ת××סף ×× ×××סף \"%s\""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr "××קת ×ת ×××× ××."
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "××××× ×× × ×××§× ×××××× ×©×× ×¡××× ×ª ש××ª× ××××."
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "××רת ×××××§ ×××× ×©× ×שת×ש ××ר. ×××©× ××××ר×ת."
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr "××קת ×ת ×פר×× ×× ××סף ××."
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr "×פר×× ×× ××סר ×××××× ×©×× ×¡××× ×ª ש××ª× ××××."
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr "××רת ×××××§ פר×× ×× ××סף ×©× ×שת×ש ××ר. ×××©× ××××ר×ת."
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "××קת ×ת ×××סף \"%s\""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr "×××סף ×× ××סר ×××××× ×©×× ×¡××× ×ª ש××ª× ××××."
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr "××רת ×××××§ ××סף ×©× ×שת×ש ××ר. ×××©× ××××ר×ת."
diff --git a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo
index d22f6ee62ee08e646cde4817937d168aaf8876c7..51c2fba029140caa5e04ab7229ae2dcbad38ddee 100644
GIT binary patch
literal 30474
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
delta 4863
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
B*02Bo
diff --git a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po
index c9f814fc..8151c9e2 100644
--- a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po
@@ -4,13 +4,13 @@
#
# Translators:
# Aleksandr Brezhnev , 2012
-# Emilio Sepúlveda , 2011
+# Emilio Sepúlveda, 2011
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-05-27 13:54-0500\n"
-"PO-Revision-Date: 2013-05-27 18:54+0000\n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/mediagoblin/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -20,250 +20,280 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "Nomine de usator"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "Contrasigno"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "Adresse de e-posta"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr ""
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr ""
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr ""
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr ""
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr ""
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr ""
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr ""
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr ""
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr ""
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr ""
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr ""
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr ""
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr ""
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr ""
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "Titulo"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr ""
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr ""
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "Etiquettas"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr ""
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr ""
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr ""
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "Sito web"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr ""
-#: mediagoblin/edit/forms.py:63
-msgid "License preference"
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
msgstr ""
#: mediagoblin/edit/forms.py:69
-msgid "This will be your default license on upload forms."
+msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
+#: mediagoblin/edit/forms.py:75
+msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr ""
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr ""
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr ""
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "Contrasigno"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
msgid "You are editing another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr ""
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr ""
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
msgid "You are editing a user's profile. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr ""
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr ""
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr ""
@@ -298,19 +328,62 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr ""
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr ""
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr ""
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "Nomine de usator"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "Adresse de e-posta"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr ""
@@ -374,7 +447,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr ""
@@ -387,59 +460,209 @@ msgid "Your OAuth clients"
msgstr ""
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr ""
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "Initiar session"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr ""
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr "File"
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr ""
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr ""
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr "Initiar session"
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -447,16 +670,16 @@ msgstr ""
msgid "Media processing panel"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
@@ -503,6 +726,59 @@ msgstr ""
msgid "No processed entries, yet!"
msgstr ""
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -535,19 +811,15 @@ msgid ""
"a happy goblin!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr ""
@@ -556,7 +828,7 @@ msgstr ""
msgid "Create an account!"
msgstr "Crear un conto!"
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr ""
@@ -590,7 +862,7 @@ msgstr ""
msgid "Explore"
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr ""
@@ -600,22 +872,27 @@ msgid ""
"extraordinarily great piece of media hosting software."
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
+msgid ""
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
+"\n"
+" Set up MediaGoblin on your own server"
msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
@@ -630,13 +907,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr ""
@@ -653,22 +930,29 @@ msgstr "Cancellar"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
+msgid "Changing %(username)s's email"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -696,12 +980,12 @@ msgstr ""
msgid "Changing %(username)s's account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
+msgid "Delete my account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
-msgid "Delete my account"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
@@ -715,6 +999,36 @@ msgstr ""
msgid "Editing %(username)s's profile"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -725,8 +1039,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr ""
@@ -750,7 +1063,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr ""
@@ -759,6 +1072,10 @@ msgstr ""
msgid "WebM file (Vorbis codec)"
msgstr ""
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -770,47 +1087,39 @@ msgstr ""
msgid "Image for %(media_title)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr ""
@@ -829,7 +1138,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
@@ -856,11 +1165,6 @@ msgstr ""
msgid "Edit"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -915,29 +1219,22 @@ msgstr ""
msgid "â Browsing media by %(username)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1096,26 +1393,34 @@ msgstr ""
msgid "Could not read the image file."
msgstr ""
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr ""
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr ""
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr ""
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1152,9 +1457,8 @@ msgstr ""
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
+"You can use Markdown for formatting."
msgstr ""
#: mediagoblin/user_pages/forms.py:31
@@ -1177,77 +1481,80 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr ""
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr ""
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr ""
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr ""
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr ""
diff --git a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo
index 596ab843d571958cb9cd98b2d8b9a4e6f22d68ee..35db081438b50bee81bbfb3b76495638bbbd6cec 100644
GIT binary patch
delta 10973
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
a?CdFH?H>Bk%&xyz6#Je9g?8_T*Zv!>s;G$o
delta 5496
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
GeDE(tr{U}X
diff --git a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po
index 77896b87..791ed227 100644
--- a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po
@@ -3,15 +3,17 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
+# Sveinn à Felli , 2013
# tryggvib , 2012
# tryggvib , 2013
+# tryggvib , 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-05-27 13:54-0500\n"
-"PO-Revision-Date: 2013-06-05 22:51+0000\n"
-"Last-Translator: tryggvib \n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 19:18+0000\n"
+"Last-Translator: cwebber \n"
"Language-Team: Icelandic (Iceland) (http://www.transifex.com/projects/p/mediagoblin/language/is_IS/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,253 +22,283 @@ msgstr ""
"Language: is_IS\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "Notandanafn"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "Lykilorð"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "Netfang"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Ãvà miður er nýskráning ekki leyfð á þessu svæði."
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
-msgstr "Notandanafn eða tölvupóstur"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr "Notandanafn eða netfang"
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr "Ãgilt notandanafn eða netfang"
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr "Ãessi reitur tekur ekki við netföngum."
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
-msgstr "à þennan reit verður að slá inn netfang."
+msgstr "à þennan reit verður að slá inn tölvupóstfang."
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "Ãvà miður er nýskráning ekki leyfð á þessu svæði."
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "Ãvà miður er nú þegar til notandi með þetta nafn."
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr "Ãvà miður þá er annar notandi à kerfinu með þetta netfang skráð."
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "Netfangið þitt hefur verið staðfest. Ãú getur núna innskráð þig, breytt kenniskránni þinni og sent inn efni!"
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "Staðfestingarlykillinn eða notendaauðkennið er rangt"
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr "Ãú verður að hafa innskráð þig svo við vitum hvert á að senda tölvupóstinn!"
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr "Ãú hefur staðfest netfangið þitt!"
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "Endursendi staðfestingartölvupóst"
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr "Ef þetta netfang (há- og lágstafir skipta máli) er skráð hjá okkur hefur tölvupóstur verið sendur með leiðbeiningum um hvernig þú getur breytt lykilorðinu þÃnu."
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr "Gat ekki fundið neinn með þetta notandanafn."
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "Tölvupóstur hefur verið sendur með leiðbeiningum um hvernig þú átt að breyta lykilorðinu þÃnu."
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr "Gat ekki sent tölvupóst um endurstillingu lykilorðs þvà notandanafnið þitt er óvirkt eða þá að þú hefur ekki staðfest netfangið þitt."
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
msgid "You can now log in using your new password."
msgstr "Ãú getur núna innskráð þig með nýja lykilorðinu þÃnu."
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "Titill"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr "Lýsing á þessu efni"
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr "Ãú getur notað\n \n Markdown til að stÃlgera textann."
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "Efnisorð"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr "Aðskildu efnisorðin með kommum."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr "Vefslóðarormur"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr "Vefslóðarormurinn getur ekki verið tómur"
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr "Titilhlutinn à vefslóð þessa efnis. Ãú þarft vanalega ekki að breyta þessu."
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
-msgstr "Leyfi"
+msgstr "Notkunarleyfi"
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr "Lýsing"
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "VefsÃða"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr "Ãetta netfang inniheldur villur"
-#: mediagoblin/edit/forms.py:63
-msgid "License preference"
-msgstr "Leyfiskjörstilling"
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr "Senda mér tölvupóst þegar einhver bætir athugasemd við efnið mitt"
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
+msgstr ""
#: mediagoblin/edit/forms.py:69
+msgid "License preference"
+msgstr "Stilling á notkunarleyfi"
+
+#: mediagoblin/edit/forms.py:75
msgid "This will be your default license on upload forms."
msgstr "Ãetta verður sjálfgefna leyfið þegar þú vilt hlaða upp efni."
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
-msgstr "Senda mér tölvupóst þegar einhver bætir athugasemd við efnið mitt"
-
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr "Ãessi titill getur verið innihaldslaus"
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "Lýsing á þessu albúmi"
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr "Titilhlutinn à vefslóð þessa albúms. Ãú þarft vanalega ekki að breyta þessu."
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr "Gamla lykilorðið"
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr "Skráðu gamla lykilorðið þitt til að sanna að þú átt þennan aðgang."
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr "Nýtt lykilorð"
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "Lykilorð"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr "Efni merkt með þessum vefslóðarormi er nú þegar til fyrir þennan notanda."
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
msgid "You are editing another user's media. Proceed with caution."
msgstr "Ãú ert að breyta efni annars notanda. Farðu mjög varlega."
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr "Ãú bættir við viðhenginu %s!"
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr "Ãú getur bara breytt þinni eigin kenniskrá."
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Ãú ert að breyta kenniskrá notanda. Farðu mjög varlega."
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr "Breytingar á kenniskrá vistaðar"
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr "Aðgangsstillingar vistaðar"
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr "Ãú verður að samþykkja eyðingu á notandaaðganginum þÃnum."
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Ãú hefur nú þegar albúm sem kallast \"%s\"!"
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr "Albúm með þessu vefslóðarormi er nú þegar til fyrir þennan notanda."
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr "Ãú ert að breyta albúmi annars notanda. Farðu mjög varlega."
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
-msgstr "Vitlaust lykilorð"
+msgstr "Rangt lykilorð"
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr "Ãað tókst að breyta lykilorðinu þÃnu"
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
-msgstr "Get ekki hlekkjað à þema... ekkert þema stillt\n"
+msgstr "Get ekki tengt þema... ekkert þema stillt\n"
#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
@@ -274,12 +306,12 @@ msgstr "Engin eignamappa fyrir þetta þema\n"
#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
-msgstr "Fann samt gamlan táknrænan tengil á möppu; fjarlægður.\n"
+msgstr "Fann samt gamlan tákntengil á möppu; fjarlægður.\n"
#: mediagoblin/gmg_commands/assetlink.py:112
#, python-format
msgid "Could not link \"%s\": %s exists and is not a symlink\n"
-msgstr "Gat ekki tengt \"%s\": %s er til og er ekki sýndartengill\n"
+msgstr "Gat ekki tengt \"%s\": %s er til og er ekki tákntengill\n"
#: mediagoblin/gmg_commands/assetlink.py:119
#, python-format
@@ -296,20 +328,63 @@ msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
"or somesuch.
Make sure to permit the settings of cookies for this "
"domain."
-msgstr "CSRF smygildi ekki til staðar. Ãetta er lÃklegast orsakað af smygildishindrara eða einhverju þess háttar.
Athugaðu hvort þú leyfir ekki alveg örugglega smygildi fyrir þetta lén."
+msgstr "CSRF smákaka ekki til staðar. Ãetta er lÃklegast orsakað af smákökugildru eða einhverju þess háttar.
Athugaðu hvort þú leyfir ekki alveg örugglega smákökur fyrir þetta lén."
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr "Ãg styð þvà miður ekki þessa gerð af skrám :("
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr "tekst ekki að keyra unoconv, athugaðu annálsskrá"
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
-msgstr "Myndbandsþverkótun mistókst"
+msgstr "Ãverkóðun myndskeiðs mistókst"
+
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr "skrifaði athugasemd við færsluna þÃna"
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "Notandanafn"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "Tölvupóstfang"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr "Notandanafn eða tölvupóstur"
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
@@ -330,7 +405,7 @@ msgstr "Banna"
#: mediagoblin/plugins/oauth/forms.py:34
msgid "Name"
-msgstr "Nafn"
+msgstr "Heiti"
#: mediagoblin/plugins/oauth/forms.py:35
msgid "The name of the OAuth client"
@@ -374,7 +449,7 @@ msgstr "Ãframsendingarvefslóðin fyrir forritin, þessi reitur\n er
msgid "This field is required for public clients"
msgstr "Ãessi reitur er nauðsynlegur fyrir opinbera biðlara"
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr "Biðlarinn {0} hefur verið skráður!"
@@ -387,59 +462,209 @@ msgid "Your OAuth clients"
msgstr "OAuth-biðlararnir þÃnir"
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr "Bæta við"
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr "Eyða"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "Innskrá"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr "Mistókst að skrá þig inn."
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr "Ãgild skrá gefin fyrir þessa margmiðlunartegund."
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr "Skrá"
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr "Ãú verður að gefa upp skrá."
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr "Jibbà jei! Ãað tókst að senda inn!"
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr "Albúmið \"%s\" var búið til!"
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr "Staðfestu netfangið þitt!"
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr "útskrá"
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: 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 "Innskrá"
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr "Notandaaðgangur: %(user_name)s"
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr "Breyta stillingum notandaaðgangs"
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -447,16 +672,16 @@ msgstr "Breyta stillingum notandaaðgangs"
msgid "Media processing panel"
msgstr "Margmiðlunarvinnsluskiki"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr "Skrá út"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Senda inn efni"
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "Búa til nýtt albúm"
@@ -503,6 +728,59 @@ msgstr "SÃðustu 10 árangursrÃku innsendingarnar"
msgid "No processed entries, yet!"
msgstr "Ekkert fullunnið efni enn!"
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -535,19 +813,15 @@ msgid ""
"a happy goblin!"
msgstr "Hæ %(username)s,\n\ntil að breyta GNU MediaGoblin lykilorðinu þÃnu opnar þú eftirfarandi vefslóð à \nvafranum þÃnum:\n\n%(verification_url)s\n\nEf þú heldur að það sé einhver vitleysa à gangi husnar þú bara þennan póst og heldur áfram að vera\nánægður durtur!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "Mistókst að skrá þig inn."
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "Ertu ekki með notendaaðgang?"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "Búðu til aðgang hérna!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr "Gleymdirðu lykilorðinu þÃnu?"
@@ -556,7 +830,7 @@ msgstr "Gleymdirðu lykilorðinu þÃnu?"
msgid "Create an account!"
msgstr "Búðu til nýjan aðgang!"
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr "Búa til"
@@ -590,7 +864,7 @@ msgstr "Gefið út undir MediaGoblin sem er ótrúlega frábær hugbúnaður til að geyma margmiðlunarefni."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr "Til að senda inn þitt efni, gera athugasemdir og fleira getur þú skráð þig inn með þÃnum MediaGoblin aðgangi."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr "Ertu ekki með aðgang? Ãað er auðvelt að búa til!"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
+msgid ""
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "Búa til aðgang á þessari sÃðu\neða\nSettu upp þinn eigin margmiðlunarþjón"
+"\n"
+" Set up MediaGoblin on your own server"
+msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
@@ -630,13 +909,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr "Breyti viðhengjum við: %(media_title)s"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr "Viðhengi"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr "Bæta við viðhengi"
@@ -653,22 +932,29 @@ msgstr "Hætta við"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "Vista breytingar"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
-msgstr "Breyti lykilorði fyrir notandann: %(username)s"
+msgid "Changing %(username)s's email"
+msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr "Vista"
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr "Breyti lykilorði fyrir notandann: %(username)s"
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -696,14 +982,14 @@ msgstr "Breyti %(media_title)s"
msgid "Changing %(username)s's account settings"
msgstr "Breyti notandaaðgangsstillingum fyrir: %(username)s"
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
-msgstr "Breyta lykilorðinu þÃnu."
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
msgid "Delete my account"
msgstr "Eyða aðganginum mÃnum"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
@@ -715,6 +1001,36 @@ msgstr "Breyti %(collection_title)s"
msgid "Editing %(username)s's profile"
msgstr "Breyti kenniskrá notandans: %(username)s"
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "Fyrir %(formatted_time)s"
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -725,11 +1041,10 @@ msgstr "Efni merkt 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/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
-msgstr "Sækja af Netinu"
+msgstr "Sækja"
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
msgid "Original"
@@ -750,7 +1065,7 @@ msgid ""
msgstr "Ãú getur náð à nýlegan vafra sem \n\tgetur spilað hljóðskrár á \n\t http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr "Upphaflega skráin"
@@ -759,6 +1074,10 @@ msgstr "Upphaflega skráin"
msgid "WebM file (Vorbis codec)"
msgstr "WebM skrá (Vorbis vÃxlþjöppun)"
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr "Búið til"
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -770,47 +1089,39 @@ msgstr "WebM skrá (Vorbis vÃxlþjöppun)"
msgid "Image for %(media_title)s"
msgstr "Mynd fyrir %(media_title)s"
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr "PDF skrá"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr "Stilla snúning af eða á"
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
-msgstr "Sjónhorf"
+msgstr "FjarvÃdd"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr "Framhlið"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr "Toppur"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr "Hlið"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr "WebGL"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr "Hala niður lÃkani"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr "Skráarsnið"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr "Hæð hlutar"
@@ -819,18 +1130,18 @@ msgid ""
"Sorry, this video will not work because\n"
" your web browser does not support HTML5 \n"
" video."
-msgstr "Ãvà miður mun þetta myndband ekki virka þvÃ\n vafrinn þinn styður ekki HTML5 \n myndbönd."
+msgstr "Ãvà miður mun þetta myndskeið ekki virka þvÃ\n vafrinn þinn styður ekki HTML5 \n myndbönd."
#: mediagoblin/templates/mediagoblin/media_displays/video.html:47
msgid ""
"You can get a modern web browser that \n"
" can play this video at \n"
" http://getfirefox.com!"
-msgstr "Ãú getur náð à nýlegan vafra sem \n sem getur spilað myndbandið á \n http://getfirefox.com!"
+msgstr "Ãú getur náð à nýlegan vafra sem \n sem getur spilað myndskeiðið á \n http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
-msgstr "WebM skrá (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
@@ -856,11 +1167,6 @@ msgstr "%(collection_title)s sem %(username)s bjó
msgid "Edit"
msgstr "Breyta"
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr "Eyða"
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -915,29 +1221,22 @@ msgstr "Efni sem %(username)s á"
msgid "â Browsing media by %(username)s"
msgstr "â Skoða efnið sem %(username)s setti inn"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr "Bæta við athugasemd"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr "Senda inn þessa athugasemd"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "Fyrir %(formatted_time)s"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr "Bætt við"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr "Skapað"
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1096,26 +1395,34 @@ msgstr "Merkt með"
msgid "Could not read the image file."
msgstr "Gat ekki lesið myndskrána."
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr "ObbosÃ!"
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr "Villa kom upp"
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr "Aðgerð ekki leyfileg"
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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 "Fyrirgefðu DavÃð. Ãg get ekki leyft þér að gera þetta!
Ãú hefur reynt að framkvæma aðger sem þú hefur ekki leyfi til. Varstu að reyna að eyða öllum notendunum aftur?"
+msgstr "Fyrirgefðu DavÃð. Ãg get ekki leyft þér að gera þetta!
Ãú reyndir að framkvæma aðgerð sem þú hefur ekki leyfi til að gera. Varstu að reyna að eyða öllum notendareikningum aftur?"
-#: mediagoblin/tools/response.py:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1152,10 +1459,9 @@ msgstr "Athugasemd"
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
-msgstr "Ãú getur notað Markdown til að stÃlgera textann"
+"You can use Markdown for formatting."
+msgstr ""
#: mediagoblin/user_pages/forms.py:31
msgid "I am sure I want to delete this"
@@ -1177,77 +1483,80 @@ msgstr "-- Velja --"
msgid "Include a note"
msgstr "Bæta við minnispunktum"
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
-msgstr "skrifaði athugasemd við færsluna þÃna"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
+msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr "Ãvà miður, athugasemdir eru óvirkar."
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr "ObbosÃ! Athugasemdin þÃn var innihaldslaus."
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr "Athugasemdin þÃn var skráð!"
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
-msgstr "Vinsamlegast kÃktu á innsendingarnar þÃnar og reyndu aftur."
+msgstr "Vinsamlegast kÃktu á færslurnar þÃnar og reyndu aftur."
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr "Ãú verður að velja eða búa til albúm"
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "\"%s\" er nú þegar à albúminu \"%s\""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "\"%s\" sett à albúmið \"%s\""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr "Ãú eyddir þessu efni."
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "Efninu var ekki eytt þar sem þú merktir ekki við að þú værir viss."
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "Ãú ert à þann mund að fara að eyða efni frá öðrum notanda. Farðu mjög varlega."
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr "Ãú tókst þetta efni úr albúminu."
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr "Ãetta efni var ekki fjarlægt af þvà að þú merktir ekki við að þú værir viss."
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr "Ãú ert à þann mund að fara að eyða efni úr albúmi annars notanda. Farðu mjög varlega."
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "Ãú eyddir albúminu \"%s\""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr "Ãessu albúmi var ekki eytt vegna þess að þu merktir ekki við að þú værir viss."
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr "Ãú ert à þann mund að fara að eyða albúmi annars notanda. Farðu mjög varlega."
diff --git a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo
index 62575b62824640850203412533f503ec7a80ca0e..2f0001eecc9ca2b73e94f7833ae8e4058281037a 100644
GIT binary patch
delta 10416
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
Qlc)dSQ!b#+qx#YR0Hw~kJOBUy
delta 5070
zcmciDdvH|M9l-Ik8%Q9$@*p7rLT-Wq5+K=-2jLY+kUU5TfrRjgkSt`gtl4B^vP+C$
z*0cmf%lJ5;A{23aL`TO*w-wM%v1)N}s!-8kECq|kYFn#T1hESC`^&wZ>P-JGL-IN2
z=HB!8{eI`(moC|k{mvFVA2VdH;@>rXCh{|KnDqYp@4GQdCDFZ#$v7cODF@EOh3Lh2
zd>Y5&t2h?VTh}k53>g`%lnrBXB*x+UN(EIajagi<$0(JDd6s<5XwZ);Rt*YWr4?$wW~L9AD+W->>8(3D)Xxz8vIue^NX?7
zQJjV+(ZDMxAxlgkj5q}uLuF$GmSHYd<0S0ETkuhojU^|V6PBYaq#9+OO&FAwchiu8
z?m$`Dy+~HnK9mQZ!Xfw@l%2hbGSNw74)qyI?j!gm*Hck)UWAf@r6|v@McK#(lv-;U
zPyE@Ox}6L1;31rf$53+lF-jyZA#~@q?9<;7Mily|Q
z!x?x5Z^g8U#QzM9M_A5A+)AlW$MYy5jbv5HxDX4l0ekQP?8b5YQ5JR&$|-pYrMOO@
z?ED-~#!oR7qYN`rIVc;b3eu1e*P(>WgOY*{lpDHH{@#l+@E(-hKY@&?j-jOReUy}a
zff5mWiW%w%l!?cpj58bM`K3ruRnSR8a<~m8fYdl^a*_26L6Q9^kFvvB~|Vf<8%7~X^ufp>8TUO@Js{(=?EuObYZEJ7J?BXX+>T0V(EHm6S0sKsya
zHmqVac?F-uM*JRUVdG4*1~hJ=)#H|vv!_G3GE+Hj@P$H8K@Xu
zB6D#L%8vagHL@FJ{9{2HF*N>;vXg5lp`Dm#4!jj*p#3NVzk(9#_i#9#LkaoEC=vP;
z!|^MWNPcT+%QyQGDC3Pnc`lf1HRhlUScnU-3{TlOt0)UwU0^OKfCNkJ#f5kr<1u`W
zc?yz{6RiqRinbo57CMpP)HWQ6J@~$y|2t_AP1Qo2SgbmTvVeDR9mbF!`Tn;ex2j9?
z&8p7gCKu-WwJNzTM_FhU$~+Ai977{OLk8-z
z+>H{ty(l^CM;YK4j=)-C<}|bp8R4O%DLWxwfHc~1eb9LUPD<}*b*~hV^FH!fiht}da)FF6{uh0
zb{tqj{QpM7Q=*g`YfH_A{2C>spP+$BW#&hz5PRr%p${*k)Jk)?c}i|WDXxPkJO2ev
z#@{0KtUf}CoUzp0z``I6DUMPcj_Xj)ZTb=cljxl6`x0$*iOldu{ad3LjyBVil_o*;ZBs4
zwcs$^YPlUp(BF+R@jl#vuOJH!s`6!K(Rh$LQgi@cVy)1_i0&YPf*)C_C%NHhc}`
z80Jv=lBx>il4?RJ+9N0nG*+44{}ni&{zc3|N1eIACQPT_XZb7+e*fR2;o=Y9RgKi(ev;j|o_VQdC})0RuP&ccKh@Kg#{T!VG*H*}S@nWmr>hzDEwAr0^fO
z2(xbB{F7eQeuGjPU&cPHU2mTMKceJn%m%Y2a_~X=yRj9gHJG(?A4+InK-uA+aSDEo
zB{-?kEIJov(+}cwd|nzcG|r)%(=Sj4j&+*v@?MmI`Y{pTLJ9RJD97$ol#pM>2>ceq
zF>Iq5$w(YYKgu!*WxNcO=O(VO8g&@Og?gkOl^1n-=?D67TGHIA
zGFx3u9;e&4(d%i;^mVwi%AA{8JZd-Mnh+OO?D6UKRnO?siB-efSyh*>qbXA#npk{qQnBu-&I!GlG{L45l0ABV
za+5ngX@7=OXE*eP+NVEb3sujI
zu1^BoH^ZT=WoPW#RykJxq#{+1svM?YthlBJD$hmxeXT~b%hjZcyk3`^NQY{w
zVr@T2^i9iGk?2rQb)!v>UfHf6SlL066LoVf>xB`f6v2K3o6OSTnZ)-xlW&v%8hdR_JHeSN^Z;9^TLt%5JE$hmJb4B(vl6#U`h|
z&2@S(yH3B)*yL*)%x);#t!\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/mediagoblin/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -23,250 +23,280 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "Nome utente"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "Password"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "Indirizzo email"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Spiacente, la registrazione è disabilitata su questa istanza."
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr "Nome utente o indirizzo email"
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr ""
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr ""
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr ""
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "Spiacente, la registrazione è disabilitata su questa istanza."
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "Spiacente, esiste già un utente con quel nome."
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr "Siamo spiacenti, un utente con quell'indirizzo email esiste già ."
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "Il tuo indirizzo email è stato verificato. Ora puoi accedere, modificare il tuo profilo e caricare immagini!"
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "La chiave di verifica o l'id utente è sbagliato"
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr "Devi effettuare l'accesso così possiamo sapere a chi inviare l'email!"
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr "Hai già verificato il tuo indirizzo email!"
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "Rispedisci email di verifica"
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "Ti è stata inviata un'email con le istruzioni per cambiare la tua password."
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr "Impossibile inviare l'email di recupero password perchè il tuo nome utente è inattivo o il tuo indirizzo email non è stato verificato."
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
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:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "Titolo"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr "Descrizione di questo lavoro"
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr "Puoi usare il\n \n Markdown per la formattazione."
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "Tags"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr "Separa le tags con la virgola."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr "Il titolo è parte dell'indirizzo del file. Nella maggior parte dei casi non c'è bisogno di cambiarlo."
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr "Licenza"
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr "Biografia"
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "Sito web"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr "Questo indirizzo contiene errori"
-#: mediagoblin/edit/forms.py:63
-msgid "License preference"
+#: mediagoblin/edit/forms.py:65
+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:67
+msgid "Enable/Disable insite notifications"
msgstr ""
#: mediagoblin/edit/forms.py:69
-msgid "This will be your default license on upload forms."
+msgid "License preference"
msgstr ""
-#: 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:75
+msgid "This will be your default license on upload forms."
+msgstr ""
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr "Password vecchia"
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr "Inserisci la vecchia password per dimostrare di essere il proprietario dell'account."
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr "Nuova password"
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "Password"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
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:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr ""
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr ""
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
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:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr "Cambiamenti del profilo salvati"
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr "Impostazioni del profilo salvate"
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr "Password errata"
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr ""
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr ""
@@ -301,19 +331,62 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr "Mi dispiace, non supporto questo tipo di file :("
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr ""
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr "Transcodifica video fallita"
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr "ha commentato il tuo post"
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "Nome utente"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "Indirizzo email"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr "Posizione"
@@ -377,7 +450,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr ""
@@ -390,59 +463,209 @@ msgid "Your OAuth clients"
msgstr ""
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr "Aggiungi"
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr "Elimina"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "Accedi"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr "Accesso fallito!"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr "File non valido per il tipo di file multimediale indicato."
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr "File"
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr "Devi specificare un file."
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr "Evviva! Caricato!"
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr "Verifica la tua email!"
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr "Accedi"
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr "Cambia le impostazioni dell'account"
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -450,16 +673,16 @@ msgstr "Cambia le impostazioni dell'account"
msgid "Media processing panel"
msgstr "Pannello di elaborazione files multimediali"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Aggiungi files multimediali"
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
@@ -506,6 +729,59 @@ msgstr "Ultimi 10 caricamenti riusciti"
msgid "No processed entries, yet!"
msgstr ""
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -538,19 +814,15 @@ msgid ""
"a happy goblin!"
msgstr "Ciao %(username)s,\n\nper cambiare la tua password MediaGoblin apri il seguente URL nel\ntuo browser web:\n\n%(verification_url)s\n\nSe pensi che questo sia un errore, ignora semplicemente questa email e continua ad essere \nun goblin felice!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "Accesso fallito!"
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "Non hai ancora un account?"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "Creane uno qui!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr "Hai dimenticato la tua password?"
@@ -559,7 +831,7 @@ msgstr "Hai dimenticato la tua password?"
msgid "Create an account!"
msgstr "Crea un account!"
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr "Crea"
@@ -593,7 +865,7 @@ msgstr "Rilasciato con licenza Mediagoblin, un ottimo programma per caricare e condividere files multimediali."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
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/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr "Non ne hai già uno? E' semplice!"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
+msgid ""
+"\n"
+" Set up MediaGoblin on your own server"
msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
@@ -633,13 +910,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr "Stai modificando gli allegati di %(media_title)s"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr "Allegati"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr "Aggiungi allegato"
@@ -656,22 +933,29 @@ msgstr "Annulla"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "Salva i cambiamenti"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
+msgid "Changing %(username)s's email"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -699,12 +983,12 @@ msgstr "Stai modificando %(media_title)s"
msgid "Changing %(username)s's account settings"
msgstr "Stai cambiando le impostazioni dell'account di %(username)s"
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
+msgid "Delete my account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
-msgid "Delete my account"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
@@ -718,6 +1002,36 @@ msgstr ""
msgid "Editing %(username)s's profile"
msgstr "Stai modificando il profilo di %(username)s"
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -728,8 +1042,7 @@ 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/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr "Scarica"
@@ -753,7 +1066,7 @@ msgid ""
msgstr "Puoi scaricare un browser web moderno,\n\t in grado di leggere questo file audio, qui \n\t http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr "File originario"
@@ -762,6 +1075,10 @@ msgstr "File originario"
msgid "WebM file (Vorbis codec)"
msgstr "File WebM (codec Vorbis)"
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -773,47 +1090,39 @@ msgstr "File WebM (codec Vorbis)"
msgid "Image for %(media_title)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr "WebGL"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr ""
@@ -832,8 +1141,8 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
-msgstr "File WebM (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
@@ -859,11 +1168,6 @@ msgstr ""
msgid "Edit"
msgstr "Modifica"
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr "Elimina"
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -918,29 +1222,22 @@ msgstr "Files multimediali di %(username)s"
msgid "â Browsing media by %(username)s"
msgstr "â Stai guardando i files multimediali di %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr "Aggiungi un commento"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr "Aggiungi questo commento"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1099,26 +1396,34 @@ msgstr "Taggato con"
msgid "Could not read the image file."
msgstr "Impossibile leggere il file immagine."
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr "Oops!"
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr ""
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr ""
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1155,10 +1460,9 @@ msgstr ""
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
-msgstr "Puoi usare il Markdown per la formattazione."
+"You can use Markdown for formatting."
+msgstr ""
#: mediagoblin/user_pages/forms.py:31
msgid "I am sure I want to delete this"
@@ -1180,77 +1484,80 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
-msgstr "ha commentato il tuo post"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
+msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr ""
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr "Oops, il tuo commento era vuoto."
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr "Il tuo commento è stato aggiunto!"
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr "Hai eliminato il file."
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "Il file non è stato eliminato perchè non hai confermato di essere sicuro."
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "Stai eliminando un file multimediale di un altro utente. Procedi con attenzione."
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr ""
diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo
index 3c82d1ff45089e708fe94b0fdaef27525257353a..ea328a9ba92e36d265357ad75f1078f568ce1ada 100644
GIT binary patch
literal 31092
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
ZW_fbx#^@O*{U;KVbNBVWxH)$J{{X_P#4!K>
delta 5039
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
A1^@s6
diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po
index 97d68127..2477ccd7 100644
--- a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ja/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: 2013-05-27 13:54-0500\n"
-"PO-Revision-Date: 2013-05-27 18:54+0000\n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/mediagoblin/language/ja/)\n"
"MIME-Version: 1.0\n"
@@ -20,250 +20,280 @@ msgstr ""
"Language: ja\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "ã¦ã¼ã¶ãã¼ã "
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "ãã¹ã¯ã¼ã"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "ã¡ã¼ã«ã¢ãã¬ã¹"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "ç³ã訳ããã¾ãããããã®ã¤ã³ã¹ã¿ã³ã¹ã§ç»é²ã¯ç¡å¹ã«ãªã£ã¦ãã¾ãã"
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr ""
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr ""
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr ""
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr ""
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "ç³ã訳ããã¾ãããããã®ã¤ã³ã¹ã¿ã³ã¹ã§ç»é²ã¯ç¡å¹ã«ãªã£ã¦ãã¾ãã"
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "ç³ã訳ããã¾ãããããã®ååãæã¤ã¦ã¼ã¶ã¼ããã§ã«åå¨ãã¦ãã¾ãã"
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr ""
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "ã¡ã¢ãã確èªããã¦ãã¾ããããã§ããã°ã¤ã³ãã¦ãããã¡ã¤ã«ãç·¨éããç»åãæåºãããã¨ãã§ãã¾ãï¼"
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "æ¤è¨¼ãã¼ã¾ãã¯ã¦ã¼ã¶ã¼IDãééã£ã¦ãã¾ã"
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr ""
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr ""
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "æ¤è¨¼ã¡ã¼ã«ãåéãã¾ããã"
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr ""
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "ã¿ã¤ãã«"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr ""
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr ""
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "ã¿ã°"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr "ã¹ã©ã°"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr "ã¹ã©ã°ã¯å¿
è¦ã§ãã"
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr ""
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr ""
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr "èªå·±ç´¹ä»"
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "URL"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr ""
-#: mediagoblin/edit/forms.py:63
-msgid "License preference"
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
msgstr ""
#: mediagoblin/edit/forms.py:69
-msgid "This will be your default license on upload forms."
+msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
+#: mediagoblin/edit/forms.py:75
+msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr ""
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr ""
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr ""
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "ãã¹ã¯ã¼ã"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr "ãã®ã¹ã©ã°ãæã¤ã¨ã³ããªã¯ããã®ã¦ã¼ã¶ã¼ã¯æ¢ã«åå¨ãã¾ãã"
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
msgid "You are editing another user's media. Proceed with caution."
msgstr "ããªãã¯ãä»ã®ã¦ã¼ã¶ã¼ã®ã¡ãã£ã¢ãç·¨éãã¦ãã¾ãããæ³¨æãã ããã"
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr ""
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr ""
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
msgid "You are editing a user's profile. Proceed with caution."
msgstr "ããªãã¯ãä»ã®ã¦ã¼ã¶ã¼ã®ãããã¡ã¤ã«ãç·¨éãã¦ãã¾ãããæ³¨æãã ããã"
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr ""
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr ""
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr ""
@@ -298,19 +328,62 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr ""
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr ""
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr ""
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "ã¦ã¼ã¶ãã¼ã "
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "ã¡ã¼ã«ã¢ãã¬ã¹"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr ""
@@ -374,7 +447,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr ""
@@ -387,59 +460,209 @@ msgid "Your OAuth clients"
msgstr ""
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr "追å "
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr "åé¤"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "ãã°ã¤ã³"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr ""
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr "ãã¡ã¤ã«"
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr "ãã¡ã¤ã«ãæä¾ããå¿
è¦ãããã¾ãã"
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr "æç¨¿çµäºï¼"
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr "ãã°ã¤ã³"
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -447,16 +670,16 @@ msgstr ""
msgid "Media processing panel"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
@@ -503,6 +726,59 @@ msgstr ""
msgid "No processed entries, yet!"
msgstr ""
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -535,19 +811,15 @@ msgid ""
"a happy goblin!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "ã¾ã ã¢ã«ã¦ã³ããæã£ã¦ãã¾ãããï¼"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "ããã§ä½æï¼"
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr "ãã¹ã¯ã¼ããå¿ãã¾ãããï¼"
@@ -556,7 +828,7 @@ msgstr "ãã¹ã¯ã¼ããå¿ãã¾ãããï¼"
msgid "Create an account!"
msgstr "ã¢ã«ã¦ã³ãã使ï¼"
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr ""
@@ -590,7 +862,7 @@ msgstr ""
msgid "Explore"
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr "ããã«ã¡ã¯ããã®MediaGoblinãµã¤ãã¸ããããï¼"
@@ -600,22 +872,27 @@ msgid ""
"extraordinarily great piece of media hosting software."
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
+msgid ""
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
+"\n"
+" Set up MediaGoblin on your own server"
msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
@@ -630,13 +907,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr ""
@@ -653,22 +930,29 @@ msgstr "ãã£ã³ã»ã«"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "æç¨¿ãã"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
+msgid "Changing %(username)s's email"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -696,12 +980,12 @@ msgstr "%(media_title)sãç·¨éä¸"
msgid "Changing %(username)s's account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
+msgid "Delete my account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
-msgid "Delete my account"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
@@ -715,6 +999,36 @@ msgstr ""
msgid "Editing %(username)s's profile"
msgstr "%(username)sããã®ãããã£ã¼ã«ãç·¨éä¸"
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -725,8 +1039,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr "ãã¦ã³ãã¼ã"
@@ -750,7 +1063,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr ""
@@ -759,6 +1072,10 @@ msgstr ""
msgid "WebM file (Vorbis codec)"
msgstr ""
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -770,47 +1087,39 @@ msgstr ""
msgid "Image for %(media_title)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr ""
@@ -829,7 +1138,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
@@ -856,11 +1165,6 @@ msgstr ""
msgid "Edit"
msgstr "ç·¨é"
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr "åé¤"
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -915,29 +1219,22 @@ msgstr "%(username)sããã®ã³ã³ãã³ã"
msgid "â Browsing media by %(username)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1096,26 +1393,34 @@ msgstr ""
msgid "Could not read the image file."
msgstr ""
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr ""
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr ""
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr ""
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1152,9 +1457,8 @@ msgstr ""
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
+"You can use Markdown for formatting."
msgstr ""
#: mediagoblin/user_pages/forms.py:31
@@ -1177,77 +1481,80 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr ""
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr ""
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr ""
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr ""
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr ""
diff --git a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo
index 7d37ab7c9c3ac463f56729f1eb8f1d0e56dbe00e..68d041e4bd6320e49ae863dee26bd75b50d7de94 100644
GIT binary patch
delta 10450
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
AlmGw#
delta 4995
zcmcK6k6)G59l-H(FTVuQNZ^Vf@&Jiq3Wz`={s0LjP()KpGw>o;xB*_eU}Pyb3(_`9
z=fNiank`K&3)bz2R*TnbHmzQzt8^<{Hl4E{K$|YNTG{sb`aIiS`vb-c?)#i`pXdDe
ze$ROxj(%@D^N!7Tc39w6#m^7?jpQ$UkktPB^Zj*7#Z$eC2^bflR0ihZ46H{79>Q2W
zicxshYX2)rmtof{Wy44e$7uXiDW6KBkV%7mm{Qr8jpp~P#@qByny_w%X|#QkZ7es(SdTEfsr^7hcdn@qL50%LJY!I>w-3`z72C|-;Kq1
z8cT2#v&cp_O2L|5ks&Tv#=aTVLRT3dr=maFv1-07Lj3a>Fwih_9op>?q1WCy_DKS17p;;X~S!P;y>?l7bSH`XYdJ>=!2jO)nDTuKghq4K$qAX-y8u2$M)Y2dW
zK7v7b1ZBp()`h>v5b9S@I=G5MF@l>U1qmqEPeT^3mf|98$71{#3-N{wP5{u>2CT
zBHoU&ATP>Z*o<_ix-cAf;HPr_4^SYQY9n!Cvg%bN2h1QJkkUW^j4a^$3{c6=P4M_Je{JXU2wO*jhgLm8(FeTfvhDM&}}p3gMEc9JW!1IN~U(T)l
zW^?mQ1bt}W+gOBsC>>6uB2GpL{R}j)6oarHWk4^^#tk?cPvXz^w4QWxK_E{}Tlo(T)|E8xDF+CJ5V;`aZJY3
zC@K3E4NNLEBVOpEAe*BUWhE6DiZ1H{4<=G?K}kgy%DbQk*+=S4l=}zG;pv8PDE;K4
zTt6E*NU8$mx-OImA3{l??-Yd?3V%kK@gTOk%-Df)Or~HMmSG4k!6bB|Y@#-l0k`82
zd;$kyH-_V39E`ul8}U7S7_TA`@u{{lbLP(?`%Jx$q(?>1GbeC|r3W|B{t!xpBFoK?
z$73q>JPbq^%7pGhS-{;W5p1{W`%xzHDqeg4e?~!eV?WAF!{?jN_88npy%l9bH!Lt;
zyLTb`PrZ(k^MG5;2U8+SsPDjs@Nry$u?x+}w4zL`17!jl=dk}&F9r6I3SVRnuo&f3
zJdLaHIF7@d#pdpHB7Lh3$gS#Qlw+5{e=Sd71M*Z>*WGSz+G3Olbf84)IV`{r@!I=8
zc8R&G^HEmZi?X>~OL^zxKFq{mj)bfr7dK!&4#77u0Do(Je+DC{pF??$Ttu{!4co5-in?lEUCh;x8ALR+QGXaw*D<4Y(OMp@D|Wd|wx!M5-18a5GAX
zJ24RVp&ZYrQBw3g2H_E_-fMXbQ)qt|<-U<$TZL~?Li_`kW9Uky{HLQ*ZMtz*RB~ml
zyQa3Dzvd*P*6Uh1Eot;vudBx0)a>$BuJ+caHYMptqs9ezykR;bYJ6ggyUv}~;Hq{z
zYdlr;?p0|XZ%ul!b48tdRZX#{rP-sqXN}isj(C5J;}yI9DrS;SAMuVpH+q(Ch}Akh
zE;?YQ+oLPXp3}2OmJMojHZ`?)yw$pAUaUScGIdM*Ox;;N$^UMAoJ}uTFjyxiROlTE
zD|NE5PCsRo>6pYE|N6uoc7NPxuifEU-K^$#YHAqVaIZ2}I^FfI>O_5FjOY3?XM;4Dsw(w@yoaL|0cv>y~j9x_)`PzwyTBZ2s~IA$GlM<#1hrK%DV>u&UT5YE*SqUC`qOhhw-2tVsdpI*Jk8E#myXJvs@roP
z3C_vNXv{PGL#NEQ>np31{a2>GZ_{_pSf|h5o8<4#A7azlGYj-@W=_{xh3j=svcrGA
z(6EJNPsqHr|N(HK;KIb_-`*uvW5OTq-nZ+UeT8LL>)@XI?K08%4+nP1)cgqXO!N1
z>sp<%aE(5?aF&1SqD2Az%}WOCdi$~zePY@Ekp5jS^gY$4bn871ed*3EWTsSKte8u7
zBK4(8m%o0w*Y1y4(IuJb(2Ht5j~aMr=a(-ZHv0E$?eo8&%$h&Jz1OCL>i(fe)aOfP
z{JZN51OF#0XB+40<##_jbfBZ7f7ffqSSve`-Z$<3vejSM^qH2P$bn6V`VQ_N=xFcX
z)n@eXY#Z46f}SvA`tZ3(E~w
Sen4lq<8{^A5B2\n"
"Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/mediagoblin/language/ko_KR/)\n"
"MIME-Version: 1.0\n"
@@ -19,250 +19,280 @@ msgstr ""
"Language: ko_KR\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "ì¬ì©ì ì´ë¦"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "ë¹ë°ë²í¸"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "email 주ì"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "ì£ì¡í©ëë¤. ì§ê¸ì ê°ì
íì¤ ì ììµëë¤."
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr "ì¬ì©ì ì´ë¦ ëë email"
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr ""
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr ""
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr ""
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "ì£ì¡í©ëë¤. ì§ê¸ì ê°ì
íì¤ ì ììµëë¤."
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "ì£ì¡í©ëë¤. í´ë¹ ì¬ì©ì ì´ë¦ì´ ì´ë¯¸ ì¡´ì¬ í©ëë¤."
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr "ì£ì¡í©ëë¤. ì¬ì©ìì í´ë¹ ì´ë©ì¼ì ì´ë¯¸ ë±ë¡ëì´ ììµëë¤."
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "í´ë¹ email 주ìê° ì´ë¯¸ ì¸ì¦ ëì´ ììµëë¤. ì§ê¸ ë¡ê·¸ì¸íìê³ ê³ì ì 보를 ìì íê³ ì¬ì§ì ì ì¡í´ ë³´ì¸ì!"
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "ì¸ì¦ í¤ ëë ì¬ì©ì IDê° ì¬ë°ë¥´ì§ ììµëë¤."
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr "ë¡ê·¸ì¸ì íì
ì¼ ê³ ë¸ë¦°ìì ë©ì¼ì ë³´ë¼ ì ììµëë¤!"
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr "ì´ë¯¸ ì¸ì¦ë°ì email 주ì를 ê°ì§ê³ ììµëë¤!"
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "ì¸ì¦ ë©ì¼ì ë¤ì ë³´ë´ ì£¼ì¸ì."
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "ë¹ë°ë²í¸ë¥¼ ë³ê²½íë ë°©ë²ì ëí ì¤ëª
ìê° ë©ì¼ë¡ ì ì¡ ëììµëë¤."
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr "ì¬ì©ìì ì´ë¦ì´ ì¡´ì¬íì§ ìê±°ë, ì¬ì©ìì email 주ìê° ì¸ì¦ëì§ ìì ë¹ë°ë²í¸ 복구 ë©ì¼ì ë³´ë¼ ì ììµëë¤."
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
msgid "You can now log in using your new password."
msgstr "ì´ì ìë¡ì´ ë¹ë°ë²í¸ë¡ ë¡ê·¸ì¸ íì¤ ì ììµëë¤."
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "ì 목"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr "ì´ ìì
ì ëí ì¤ëª
"
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr "í¬ë©§í
ì ì¬ì©íë ¤ë©´\n \n Markdown ë§í¬ë¥¼ ì°¸ê³ íì¸ì."
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "íê·¸"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr "íê·¸ë , ë¡ êµ¬ë¶ ë©ëë¤."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr "'ì¬ë¬ê·¸'"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr "'ì¬ë¬ê·¸'ë ê³µë°±ì¼ ì ììµëë¤."
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr "ì 목ì 미ëì´ ì£¼ìì ì¼ë¶ë¶ ì
ëë¤. ìì íì§ ììë ë©ëë¤."
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr "License"
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr "ìê°"
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "ì¹ ì£¼ì"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr "주ìì ìë¬ê° ììµëë¤."
-#: mediagoblin/edit/forms.py:63
-msgid "License preference"
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr "ì 미ëì´ì ëí 컨í
ì ìíë¤ë©´, ë©ì¼ì ë³´ë´ì£¼ì¸ì."
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
msgstr ""
#: mediagoblin/edit/forms.py:69
-msgid "This will be your default license on upload forms."
+msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
-msgstr "ì 미ëì´ì ëí 컨í
ì ìíë¤ë©´, ë©ì¼ì ë³´ë´ì£¼ì¸ì."
+#: mediagoblin/edit/forms.py:75
+msgid "This will be your default license on upload forms."
+msgstr ""
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr "ì 목ì ê³µë°±ì¼ ì ììµëë¤."
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "모ìì§ì ëí ì¤ëª
"
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr "ìì ë¹ë°ë²í¸"
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr "ê³ì íì¸ì ìí´, ì´ì ë¹ë° ë²í¸ë¥¼ ì
ë ¥í´ ì£¼ì¸ì."
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr "ìë¡ì´ ë¹ë°ë²í¸"
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "ë¹ë°ë²í¸"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr "í´ë¹ ì ì ì ëí 'ì¬ë¬ê·¸'ê° ì´ë¯¸ ì¡´ì¬í©ëë¤."
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
msgid "You are editing another user's media. Proceed with caution."
msgstr "ë¤ë¥¸ ì¬ì©ìì 미ëì´ë¥¼ ìì íê³ ììµëë¤. ì¡°ì¬í´ì ìì íì¸ì."
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr ""
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr ""
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
msgid "You are editing a user's profile. Proceed with caution."
msgstr "ì¬ì©ìì ê³ì ì 보를 ìì íê³ ììµëë¤. ì¡°ì¬í´ì ìì íì¸ì."
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr "ê³ì ì ë³´ê° ì ì¥ ëììµëë¤."
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr "ê³ì ì¤ì ì´ ì ì¥ ëììµëë¤."
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "\"%s\" 모ìì§ì ì´ë¯¸ ê°ì§ê³ ììµëë¤!"
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr "ë¤ë¥¸ ì ì ì 모ìì§ì ìì ì¤ ì
ëë¤. 주ìíì¸ì."
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr "ì못ë ë¹ë°ë²í¸"
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr ""
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr "í
ë§ì ì°ê²°í ì ììµëë¤... í
ë§ ì
ì´ ììµëë¤.\n"
@@ -297,19 +327,62 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr "ì£ì¡í©ëë¤. í´ë¹ íì
ì íì¼ì ì§ìíì§ ììì :("
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr ""
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr "ë¹ëì¤ ë³íì ì¤í¨ íìµëë¤."
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr "ê²ì물ì ë§ê¸ì´ ë¬ë ¸ìµëë¤."
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "ì¬ì©ì ì´ë¦"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "email 주ì"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr "ì¥ì"
@@ -373,7 +446,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr "ì´ í목ì ê³µê° ì¬ì©ìë¤ì ìí´ ê¼ íì í©ëë¤."
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr "ì¬ì©ì {0}ëì´ ë±ë¡ ëììµëë¤!"
@@ -386,59 +459,209 @@ msgid "Your OAuth clients"
msgstr ""
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr "ì¶ê°"
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr "ìì "
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "ë¡ê·¸ì¸"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr "ë¡ê·¸ì¸ì ì¤í¨ íìµëë¤!"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr "ìììë 미ëì´ íì¼ ì
ëë¤."
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr "íì¼"
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr "íì¼ì ë±ë¡íì
ì¼ í©ëë¤."
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr "ì´í!! ë±ë¡íìµëë¤!"
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr "\"%s\" 모ìì§ì´ ì¶ê°ëììµëë¤!"
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr "ë©ì¼ì íì¸íì¸ì!"
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr "ë¡ê·¸ì¸"
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr "ê³ì ì¤ì ë³ê²½"
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -446,16 +669,16 @@ msgstr "ê³ì ì¤ì ë³ê²½"
msgid "Media processing panel"
msgstr "미ëì´ ìì
í¨ë"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "미ëì´ ì¶ê°"
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
@@ -502,6 +725,59 @@ msgstr "ì§ë 10ê°ì ì
ë¡ë 목ë¡"
msgid "No processed entries, yet!"
msgstr ""
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -534,19 +810,15 @@ msgid ""
"a happy goblin!"
msgstr "ìë
íì¸ì %(username)s,\n\nGNU MediaGoblinì ì¬ì©ì ê³ì ë¹ë°ë²í¸ë¥¼ ë°ê¾¸ìë ¤ë©´, ì¸í°ë· ì°½ì ì¬ìê³ ìë URLì íµí´ ì ì íì¸ì. :\n\n%(verification_url)s\n\nì¤ë¥ë¼ê³ ìê° ëë¤ë©´, ì´ ë©ì¼ì 무ìíìê³ ê³ ë¸ë¦°ì ì¦ê¸°ì¸ì!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "ë¡ê·¸ì¸ì ì¤í¨ íìµëë¤!"
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "ìì§ ê³ì ì´ ìì¼ì¸ì?"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "ì´ê³³ìì ìë¡ ë§ëì¸ì!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr "ë¹ë°ë²í¸ë¥¼ ìì¼ì
¨ëì?"
@@ -555,7 +827,7 @@ msgstr "ë¹ë°ë²í¸ë¥¼ ìì¼ì
¨ëì?"
msgid "Create an account!"
msgstr "ê³ì ì ìë¡ ë§ëëë¤!"
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr "ìì±"
@@ -589,7 +861,7 @@ msgstr "Released under the MediaGoblinì¼ë¡ ìë ì¤ì
ëë¤. ì´ë í¹ì´í 미ëì´ í¸ì¤í
ìíí¸ì¨ì´ì¤ íë ì
ëë¤."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr "ìì ì 미ëì´ë¥¼ ì¶ê°íê³ , ëê¸ì ë¨ê¸°ì¸ì! 미ëì´ ê³ ë¸ë¦° ê³ì ì¼ë¡ ë´ìì íì¸ íì¤ ì ììµëë¤!"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr "ìì§ ì무ê²ë ìì¼ìë¤êµ¬ì? ë§¤ì° ì½ìµëë¤!"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
+msgid ""
+"\n"
+" Set up MediaGoblin on your own server"
msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
@@ -629,13 +906,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr "%(media_title)sì ì²¨ë¶ ìì ì¤..."
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr "첨ë¶"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr "ì²¨ë¶ ì¶ê°"
@@ -652,22 +929,29 @@ msgstr "ì·¨ì"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "ì ì¥"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
+msgid "Changing %(username)s's email"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -695,12 +979,12 @@ msgstr "%(media_title)s í¸ì§ì¤..."
msgid "Changing %(username)s's account settings"
msgstr "%(username)s'ì ê³ì ì¤ì ë³ê²½ì¤..."
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
+msgid "Delete my account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
-msgid "Delete my account"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
@@ -714,6 +998,36 @@ msgstr "%(collection_title)s í¸ì§ ì¤"
msgid "Editing %(username)s's profile"
msgstr "%(username)sì ê³ì ì ë³´ ìì ì¤..."
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -724,8 +1038,7 @@ 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/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr "ë¤ì´ë¡ë"
@@ -749,7 +1062,7 @@ msgid ""
msgstr "ì¬ì´ë íì¼ì ì¬ì íìë ¤ë©´\n\tì´ê³³ìì ìµì ì ë¸ë¼ì°ì ¸ë¥¼ ë¤ì´ë°ì¼ì¸ì! \n\t http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr "ì본 íì¼"
@@ -758,6 +1071,10 @@ msgstr "ì본 íì¼"
msgid "WebM file (Vorbis codec)"
msgstr "WebM íì¼ (Vorbis ì½ë±)"
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -769,47 +1086,39 @@ msgstr "WebM íì¼ (Vorbis ì½ë±)"
msgid "Image for %(media_title)s"
msgstr "%(media_title)s ì´ë¯¸ì§"
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr ""
@@ -828,8 +1137,8 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
-msgstr "WebM íì¼ (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
@@ -855,11 +1164,6 @@ msgstr "%(username)sì %(collection_title)s"
msgid "Edit"
msgstr "ìì "
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr "ìì "
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -914,29 +1218,22 @@ msgstr "%(username)sì 미ëì´"
msgid "â Browsing media by %(username)s"
msgstr "â %(username)sì 미ëì´ë¥¼ ë³´ê³ ììµëë¤."
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr "ë§ê¸ ë¬ê¸°"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr "ë§ê¸ ì¶ê°"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1095,26 +1392,34 @@ msgstr "íê·¸ ì ë³´"
msgid "Could not read the image file."
msgstr "ì´ë¯¸ì§ íì¼ì ì½ì ì ììµëë¤."
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr "ìì¤!"
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr ""
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr ""
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1151,10 +1456,9 @@ msgstr ""
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
-msgstr "í¬ë©§í
ì ìí´ Markdown ì ì¬ì©í ì ììµëë¤.."
+"You can use Markdown for formatting."
+msgstr ""
#: mediagoblin/user_pages/forms.py:31
msgid "I am sure I want to delete this"
@@ -1176,77 +1480,80 @@ msgstr "-- ì í --"
msgid "Include a note"
msgstr "ë
¸í¸ ì¶ê°"
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
-msgstr "ê²ì물ì ë§ê¸ì´ ë¬ë ¸ìµëë¤."
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
+msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr ""
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr "ì¤ì°, ëê¸ì´ ë¹ììµëë¤."
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr "ëê¸ì´ ë±ë¡ ëììµëë¤!"
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr "íì¸ì íìê³ ë¤ì ìëíì¸ì."
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr "모ìì§ì ì¶ê°íê±°ë 기존 모ìì§ì ì ííì¸ì."
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "\"%s\" 모ìì§ì´ ì´ë¯¸ ì¡´ì¬ í©ëë¤. \"%s\""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "\"%s\" 모ìì§ì ì¶ê°íìµëë¤. \"%s\""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr "미ëì´ë¥¼ ìì íìµëë¤."
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "íì¸ ì²´í¬ë¥¼ íì§ ìììµëë¤. 미ëì´ë ìì ëì§ ìììµëë¤."
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "ë¤ë¥¸ ì¬ëì 미ëì´ë¥¼ ìì íë ¤ê³ í©ëë¤. ë¤ì íë² íì¸íì¸ì."
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr "모ìì§ì ìë í목ì ìì íìµëë¤."
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr "íì¸ì íì§ ìììµëë¤. í목ì ìì íì§ ìììµëë¤."
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr "ë¤ë¥¸ ì¬ì©ìì 모ìì§ì ìë í목ì ìì íììµëë¤. 주ìíì¸ì."
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "\"%s\" 모ìì§ì ìì íì
¨ìµëë¤."
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr "íì¸ì íì§ ìììµëë¤. 모ìì§ì ìì íì§ ìììµëë¤."
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr "ë¤ë¥¸ ì¬ì©ìì 모ìì§ì ìì íë ¤ê³ í©ëë¤. 주ìíì¸ì."
diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo
index 4e6e51ce1809030467c75beb68db3412d93469de..09b42b99217628d6d02f12ba35d1c98269c336cf 100644
GIT binary patch
delta 10357
zcmd_u33OHUoxt&b*b}w{LdXKiWzGHw2}=U9B!o3WLI@&jczN$8xs#Xs!h0`?QQ*;5
z5v<$HtyC;d4`mdpoig^hv}LBJ9L5!@h#jkSIaX>did2}kr&H0H@9*9lAc$3`p3ZcJ
z!|`+f_uczne*fS9fB*8(;kf;0vNal&zv}=MqzS-lrH`ml&n+-#lbioZ^ShG
zXB>?$Vix`ui!gZvb>VzW!J9B0_aKj`$K3nJaDY-#b&?C(R;O_gp21@L0H>mdS|*_%
z*WlOiW?uLWmQn6ZbsBmIdsBW2Gw>KD;;(Tq{s&42`qO(UkHR6eukyHv=SCUI3-fR|
z*4Ymz)r`56JFzeBb${RQmJi`H?jOc{`~xn+@eF$jwxSH=`zZCFK@a{X#?!v?(A|Mp
ziqf-6WN@n1)j;XsHk9XXK^f^T9ESJcZv02=hYOj;$Kg4Y
zoJgV4VqA(c&}}FU??4&AZBZ^HB)d^6KIs1N2ri_27z;3-3EhIz@MriiHsGzamXE)|
zk1%7rGbQQF6Jt@;Sc*a1iU+U@vnRTd+RFvgr4FHF{mUpJdJknJ=aIIQ#_%Pi^H4^z
z0cA=WQ9|2={qV~u5!{LW@qU!&zKasE!zk@MhvXRRp9|^fA5oGbop{Qe=c80K3ngT0
zP?EIX{XO88x1x0LtFGTgY4CZJB>p8z$3H+>4Jl-%ST__`b7&SbE1MpRpDSXTI1C)l7@|+Oopfp(Fme-=Z*N%f}Uu|`7-0FH4N^<-?
z(rNVoN&_$8c0A>l+n9K%cso|$H&N#LO_WGxkT^1+0=xsuPzLZcO0phDSt;rrE+oVW
zh0Y5@aWdsmC{wWvrJ;@P?_DSz+K%$x9+Z0ay5+;Tit-b9A7--M$w2-Ur{a4^lWN=~
z;y;~>8aDXZxC0mAlURa@MNa4|QRc7#rDI!=L8^ne246uRPUA;O-g{7{?AtgHpG4{C
z3rO4QC7gx*i;2H9G@nH(InaewcrVV!Q@8*p@sK2A2bySMIrd`vlccIdiO@P+f$g{q
zpGFCFD#Ml$7b8JY^|%*ri*g}7n#69Q;Rck3qDUU8J+4n6OIN**b(lifwqXkrEOi<;
z;wTb;KC3M#$@@>Z0UyQQIHJsnL>fvGMl-oc;v(C%3{xmqp@gsjhv7C%MGH0j4obs6
zL22kil=phiaGp!Y{*+5l-k*s>a2ZOy>yd#*)eT&b(CThniAPX!AZ;d_4K^TyQ}^Rs
zd>#3#vaWKz=WB62EY
z69>8`VN@y}$weQW?K%&o!bM2bR4qOm$4-bHlk0{UeS?1(GB1&>4<8I7GdG0Wd#iJ-wbOuM_plYXs(eYf!4>hQviG%PCOu#)T
z9oUck@kclmpTG(DB96iHC?n5gn37W~P*&CTC=q)f<^A;K&bMQ%V^o!Lk;D(nP#)Nb
zGO}jO#0Vy$g-Q4iI07HVK6nh}`R7rde+?xm&%377I^`mieP#(tZnUF){@==lG<+Kl
z!@E#MbO1-;Gbk0ljWV)0Hu!AJL7DR!l!#q}Ip{-q{#G1^_v2iA28(eZ`?pNZZ0t||
zsYP7K2x>4H*P&Fr2_@8>xDanf*$JOR+3EVPWc$S%u>otZaXRn_enk0ooPw{da;9L|
zwa)qAD%{Hbc8u=e;zp1TY9>P)hEXvfpi&^--TTb-yy`Ve-@56SSgc)Qk$r)8uToiF*8&1cE
za5kR8MVRArw#-d9n(}?w_^z&!*Qq@owMM0oKLY0S;Fd3lo2O1F24`aqj;@|0pO53qZpQo;CvpdHBjvYI
z8d?-^lJ^EA9n_bwH@<<-Di4wUO
z_QkhRvi?1k=lT$){x}+k;{?|-llV);OSvH-ZNWU;foy6jhKn#h=Gw<+zCR
z-ClrMl)sKL6^~&i{sJeWeCp~T8)YDyaWd{k$&I5Z$vU{hS#6a#jB+6A-Vo)5{U{-O
z8D);op$}6#oepe9X>bpw;1SoKqs-}9Ou*lvOs%@k34LGeM{zL96eYX&OViyOV^J#3
zL3y#-wGIbTUX3ym9aVy+Sv!*otesVZ5<|MzA8FS8L0{Mt3^h%%UQ8;8=K<%BwJs?y
zQ`3SWrA308*XPs2VXZ6J9+K-|yBV3I#m*1Sjf?di_S0S?YV=SzXnHlh)oTPauiqcy
zaqC3#i~*)r-KLw1E3JMbPUJ~7Z4qxnK-bzrL8;O(o3uuQa;G<}nZbzGNZo!_ZatT|
z$jVHy3ftNOhR+)@f@WCjG$PI2U7=H#_D1u0%^8|?FlFTO^7cq`Fl1bBzodGUw0XhS
zwtybdFT1_KFpV&wxNuun6<)tqt8Z%8!;yWDr^F33%*J4-)vnWec4S3gd!$^YS&69?
zD_dK2Gosam^bSMsRP%yuU7FYQYi-_eMAstCMp!eGU0<`;Y@!DeLsCjJn#^EGPq3%Ze!>%r&y4g+HB1?vk2U1Xfx9TiSl4Nz
z2YEv+nl})jcCX*Ev|w~;dpIH)-(mRe84Jp^)JK9Xy6I8Nh=f{3|9wF_jly=J$4avA
zkWAsuV92kQ1>Gsvh+~K0a~6-ia0pgNn?McBd^oH}7-vZLS;J+#CGG(
zYV%l|mMpcN8Z)bqb*h}@YOlv|yS?li+XI0vUTh6^kd^KO*)%}K-VawcE
ztyQ<*ViBo+g?(f&G35*G(F<;cs#kW1LG5VMVWYaLN%7I
zHy{%!5peqGq_&;Y&X7H7MKBcVDv&h#Z1440fggK)32XPt?b>m+TkcUq_l|q9Ci06-
z#_(C^CgxjdHJR4&iPdBEOY??UvyTV-_VQ?uWyZ#9jmZ9SbVbD5B{SH>Kn+u^Xm1Gn
zLPmo#?CvDhf+mSJM%8)k=cHqD9aeR+*4-px5VH6#51fq6`G|O&$9oK>zI!whgHL~5
zzw-Y0$q5{LEBp4iS>5X(EE_jVSvDV8PK1SK4YR`=F#H9Yy9fD$?9l8^&AP8eGa{Cm
z`*O1EVwypSSATJ64h2`*CLzc4cWQuz0;nH2s@F~E}LEx8;4hG4O++7j*L}KJ`p!mi+Dra
zoi(<;A>cJztPv&U){)}lNtfLpJKOSeOkmr1G54
zb#4r&RobU%a_nQL#(foAKK0bNqmLZCtiAJ=kDG6P`oZz+yo!YR7fz1Wf{ff)N#)-E
zAE!qvK6833eqqC(I6*cp&gyxB{L13iFW>}e=eS4&I&4;~wD952Tr_p{}mj;?TMysPG!g3ohkv^Fds
z8T~U)i5I^9|II^UmiE43E>JxJ5}fA-c`
z)!JL)tnU|ZxWbWfn)Pq%nyspmMSms7#`V+U>~Q{%oE(?vTC?6@y}M!RYNj;Qy$HY9
evtw3$x;1L*1go_EJD+fVv<^=lZ}s2!z<&WL+mVg{
delta 5048
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\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/mediagoblin/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -20,250 +20,280 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "Gebruikersnaam"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "Wachtwoord"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "E-mail adres"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Sorry, registratie is uitgeschakeld op deze instantie."
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr "Gebruikersnaam of email-adres"
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr ""
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr ""
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr ""
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "Sorry, registratie is uitgeschakeld op deze instantie."
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "Sorry, er bestaat al een gebruiker met die naam."
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr "Sorry, een gebruiker met dat e-mailadres bestaat al."
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "Uw e-mailadres is geverifieerd. U kunt nu inloggen, uw profiel bewerken, en afbeeldingen toevoegen!"
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "De verificatie sleutel of gebruikers-ID is onjuist"
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr "Je moet ingelogd zijn, anders weten we niet waar we de e-mail naartoe moeten sturen!"
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr "Je hebt je e-mailadres al geverifieerd!"
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "Verificatie e-mail opnieuw opgestuurd."
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "Een e-mail met instructies om je wachtwoord te veranderen is verstuurd."
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr "Email kon niet verstuurd worden omdat je gebruikersnaam inactief is of omdat je e-mailadres nog niet geverifieerd is."
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
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:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "Titel"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr "Beschrijving van dit werk"
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr "Voor opmaak kun je Markdown gebruiken."
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "Etiket"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr "Hou labels gescheiden met komma's."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr "Slug"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr "De slug kan niet leeg zijn"
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr "Het titelgedeelte van het adres van deze media. Normaal gesproken hoef je deze niet te veranderen."
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr "Licentie"
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr "Bio"
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "Website"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr "Dit adres bevat fouten"
-#: mediagoblin/edit/forms.py:63
-msgid "License preference"
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
msgstr ""
#: mediagoblin/edit/forms.py:69
-msgid "This will be your default license on upload forms."
+msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
+#: mediagoblin/edit/forms.py:75
+msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr "Oud wachtwoord"
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr "Vul je oude wachtwoord in om te bewijzen dat dit jouw account is"
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr "Nieuw wachtwoord"
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr "Er bestaat al een met die slug voor deze gebruiker."
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
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:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr ""
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr ""
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
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:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr "Profielaanpassingen opgeslagen"
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr "Accountinstellingen opgeslagen"
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr "Verkeerd wachtwoord"
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr ""
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr ""
@@ -298,19 +328,62 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr "Sorry, dat bestandstype wordt niet ondersteunt."
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr ""
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr ""
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "Gebruikersnaam"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "E-mail adres"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr "Locatie"
@@ -374,7 +447,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr ""
@@ -387,59 +460,209 @@ msgid "Your OAuth clients"
msgstr ""
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr "Voeg toe"
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "Inloggen"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr "Inloggen is mislukt!"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr "Verkeerd bestandsformaat voor mediatype opgegeven."
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr "Bestand"
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr "U moet een bestand aangeven."
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr "Mooizo! Toegevoegd!"
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr "Verifieer je e-mailadres!"
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr "Inloggen"
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr "Accountinstellingen aanpassen"
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -447,16 +670,16 @@ msgstr "Accountinstellingen aanpassen"
msgid "Media processing panel"
msgstr "Mediaverwerkingspaneel"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Voeg media toe"
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
@@ -503,6 +726,59 @@ msgstr ""
msgid "No processed entries, yet!"
msgstr ""
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -535,19 +811,15 @@ msgid ""
"a happy goblin!"
msgstr "Hoi %(username)s,\n\nOm je wachtwoord voor GNU MediaGoblin te veranderen, moet je dit adres in je webbrowser openen:\n\n%(verification_url)s\n\nAls je denkt dat dit niet klopt, kun je deze e-mail gewoon negeren."
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "Inloggen is mislukt!"
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "Heeft u nog geen account?"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "Maak er hier een!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr "Wachtwoord vergeten?"
@@ -556,7 +828,7 @@ msgstr "Wachtwoord vergeten?"
msgid "Create an account!"
msgstr "Maak een account aan!"
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr "Creëer"
@@ -590,7 +862,7 @@ msgstr "Uitgegeven onder de MediaGoblin, een buitengewoon goed stuk software voor mediahosting."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr "Heb je er nog geen? Het is heel eenvoudig!"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
+msgid ""
+"\n"
+" Set up MediaGoblin on your own server"
msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
@@ -630,13 +907,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr ""
@@ -653,22 +930,29 @@ msgstr "Annuleren"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "Wijzigingen opslaan"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
+msgid "Changing %(username)s's email"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -696,12 +980,12 @@ msgstr "%(media_title)s aanpassen"
msgid "Changing %(username)s's account settings"
msgstr "%(username)ss accountinstellingen aanpassen"
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
+msgid "Delete my account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
-msgid "Delete my account"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
@@ -715,6 +999,36 @@ msgstr ""
msgid "Editing %(username)s's profile"
msgstr "Het profiel aanpassen van %(username)s"
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -725,8 +1039,7 @@ 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/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr ""
@@ -750,7 +1063,7 @@ msgid ""
msgstr "U kunt een moderne web-browser die \n\taudio kan afspelen vinden op \n\t http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr ""
@@ -759,6 +1072,10 @@ msgstr ""
msgid "WebM file (Vorbis codec)"
msgstr ""
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -770,47 +1087,39 @@ msgstr ""
msgid "Image for %(media_title)s"
msgstr "Afbeelding voor %(media_title)s"
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr ""
@@ -829,7 +1138,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
@@ -856,11 +1165,6 @@ msgstr ""
msgid "Edit"
msgstr "Pas aan"
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr "Verwijderen"
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -915,29 +1219,22 @@ msgstr "Media van %(username)s "
msgid "â Browsing media by %(username)s"
msgstr "â Blader door media van %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr "Geef een reactie"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr "Voeg dit bericht toe"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1096,26 +1393,34 @@ msgstr "Getagged met"
msgid "Could not read the image file."
msgstr "Kon het afbeeldingsbestand niet lezen."
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr "Oeps!"
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr ""
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr ""
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1152,10 +1457,9 @@ msgstr ""
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
-msgstr "Voor opmaak kun je <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> gebruiken."
+"You can use Markdown for formatting."
+msgstr ""
#: mediagoblin/user_pages/forms.py:31
msgid "I am sure I want to delete this"
@@ -1177,77 +1481,80 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr ""
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr "Oeps, je bericht was leeg."
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr "Je bericht is geplaatst!"
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr "Je hebt deze media verwijderd."
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "Deze media was niet verwijderd omdat je niet hebt aangegeven dat je het zeker weet."
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "Je staat op het punt de media van iemand anders te verwijderen. Pas op."
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr ""
diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo
index 9cbd03b267dab8820b158303343e251661fa10a6..739458d7013ad3e6c517008974fb60d86df3de85 100644
GIT binary patch
delta 10463
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
delta 5091
zcma*pdvp}l9l-Isn@B={0C^c6A(LPPLZ0M7f-wXT2qXkZc&p&T4x3FjJL_g8rUENe
zKv2|jr6REus`x0h;90SPR$4i=+KOnw(^>^YXerfNPZdiKsQvyj)6+lO9FotycV~Y0
z-rxPrEGI9yJ~-@(o=J({uK4+e-{JiBPn6z&f36KwDvR#dn2o~*DOG|u;Y18z2JXk9
zcns6O{Fo0fq8fxu5~WB&*|^LO2&6#
zJ-&xCaRjTVKtD?0AEHcj5c}Z~lm)(ytX=&EAIHk5@-v`
z%C;e=q8>-NVIRiht0+4=hBDC!WDfNi%GoFIN5*qe&U_Ne5zIune=*8NmZH>J`%v=F
z=G6TR$c?*k6dpx6%Zn(PxQxu9Mhvr$q6%ff7E0hQl!dKE+1dRlN4d)xe+sA5KZpf*
z1=nESaPt3q8c(vE<#-RJJ{HfQq%?_DW#dGw!ezJ?cVIVO&xf+G@1Z;;`%sGOO_ZIV
z#*z3b=Hej3&Qux72AZNYB*hC*QszfFf-uSj-6)^0LkavS%Gp1Q#8gL7j_@qXk$sMm
z5qFNA>I9UD(@^4!N4b9{l2jG-(2z4+jgs>1C@X#v<*a^3Cc02|{us*jPoQMvIh6P>JL9KN7Jd%n<@x_74GD0qcYw;wQ)(go9NdfDC@ast
z(SF|RQHp3S_MSOPD&NFXynstEV-$}V-ieZd_b?vMA$w4N#s=nBNkpHD3ve1ff%15q
z#~{i>EKiArvXf2Ng1fN^zeHKklziSH7{VeRk9CCeXi(65wl0#zEX9N05zj{msbc)e@YK8?YWfz$th`2~PmF
zVjb=-A^$hgILE+h%;Eqy;7%kN%3#}aR*g6vL%0oJLK7Rx?Am!ACAIIOJYH9kGEgbJ
zL?&Q0%8nx_HL?{Y{?RCn6dIqP?BpAi)DEw(1K)!Zs0StRYbdFHAN%5Il$2jY$W?(Z)(fUyqwhjrWHlxh*0G^lUe>)Absk+G%bE*9(DLRjfF`e^ynma9=L_dSo
zN#I2&MHa$T>_&NCY(-hXE~kG8rAS{#S?DR0+WA}WIOl(j2Jax1RBHz;#B}PI!B)XI9~$yBc**;N;DAZC${epraI<7(`WlTa4agxzR5pP$9v@BfQ5WJgJL_Qbg;
z#ZiSh=tW7{MwGyhpj^Mh=^sRSbH0RGcok>h5YlDf3Y7cqL)rO*jy)Ka6#kfo7(?0d
zD>xWmL)qCWlw!Gn@*j{(I0C;!xh|F2dFcQY#Nk=KLi!
z&oE%%tC)*tQEqVa&{75}5r^UwY{aD~JKBeF7(>a>&rqJGU!vT93gztoh&A{Zl=ykK
zP&ZhAOH`?kXdGt1k2|N@uhRHw_V<4&8jP<*IqOXr#-C#ZOQzck+lx|Mzd+g9`zQ;!
zj5(NCZ;$6YPQyNoFOSlYl=@Lp9Kl5F#splCQq@~<2=<_4>=4Qu?=6&~yX1HoC60>%
zkW}|U*>Nh$f+|rmIRj;(Q7;V%d@o9%oj3-cMk$teurHoPN$Dk&v;RBF*(cAmKQ~ZP
zosY8cD#toZqF;}ai5A?5cOmme)ivjXj0UAR1yzOe{I5Y-@d1roc)AWG_YU=TLY!
z7G;OqP|o~$Y{9p&4s)4>?;EuO*W+U-#X6K#6yY3{7g`kaaJw`9GDc-*f2AQ44|MBzf
z3@k!9!_6oudKl$Rw-2QVkKrIZj{WfrrsF4=g02Pjn==h1^>sKEx1rS5A5b=y#jeV6
z)a0$<&LO
zhF@SlCf;g4Wo1zssSMnXvg13E&8V#?XMG+Apt{Wtn2d3BOVNcDD5)Qh^4Qg&yjX5=
zY(U9qv*RKhOMfZKeZ#lVkbn=Pq*xV-$<^}8a7wn
zoSQc~Z2J725i`8(u5e&XXRh9wmLF$@lk}jpf}AdYyT7Qz^!hzMYk9yQEV9DB;(E`D
zc7M=UZ*@g1y(q0f?}=o^GBb|2^=Fx7x_HQ2`dr>L-7!?_;$i9f`@_EN8}f8^c3EL>
zk={Lg^0utWv7K2>E}fa}*FD)Q^+;ole%ff#nK_lQbvZrm*s#2?JHxswq8crqkC_aA
z&{*m52TX5{etVQPxXIIDswT6`_)lE@lhJ-%G-h*3*c0(vK_h5I3{N0nb(vlr$@j!Q
z$uD!q<`gElbwf#qzEJYwpm`pj&-5By{z$8$-5I-k+(Ry1Uw%qgRut%QmDk6fsR+gO
z^Z5d%(QHLL5mTpC*XRw^oBLFjmxOLIV#yQcx?{hqx$M$y6W8d(P_lj~lomTsH^8MU
zCQs7uOs>`CQ`YH&BQs(jPcd9c6@}x*8>M9vD#~^LsUvDD3d>53(uxV?C1XqYNow?T
zMhfSJJ;Ba^Ct`&s7^}=chZT$%HI`TM-r@BG>UtT82vEagNce>A@Xl4Y10jF+On*M-CA7AW~k_oD&ZuT!VLn%@+H|RH(%+&d}J~ViK
zz*@!3Y{LwDI@_$Ej@-5&_R($S?%1?tmt1<}@&>(g`QG$dX1LvB@H{AKnE_8I|Ce&M2`O(ihn10
diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
index 6a11d5da..39ee99b1 100644
--- a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-05-27 13:54-0500\n"
-"PO-Revision-Date: 2013-05-31 15:40+0000\n"
-"Last-Translator: velmont \n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,250 +20,280 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "Brukarnamn"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "Passord"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "Epost"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Registrering er slege av. Orsak."
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
-msgstr "Brukarnamn eller epost"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr "Brukarnamn eller epost"
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr "Ugyldig brukarnamn eller passord."
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr "Dette feltet tek ikkje epostadresser."
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr "Dette feltet krev ei epostadresse."
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "Registrering er slege av. Orsak."
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "Ein konto med dette brukarnamnet finst allereide."
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr "Ein brukar med den epostadressa finst allereie."
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "Kontoen din er stadfesta. Du kan no logga inn, endra profilen din og lasta opp filer."
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "Stadfestingsnykelen eller brukar-ID-en din er feil."
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr "Du må vera innlogga, slik me veit kven som skal ha eposten."
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr "Du har allereie verifisiert epostadressa."
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "Send ein ny stadfestingsepost."
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr "Dersom denne epostadressa er registrert, har ein epost med instruksjonar for å endra passord vorte sendt til han."
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr "Fann ingen med det brukarnamnet."
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "Sender epost med instruksjonar for å endra passordet ditt."
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr "Kunne ikkje senda epost. Brukarnamnet ditt er inaktivt eller uverifisert."
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
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:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "Tittel"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr "Skildring av verk"
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr "Du kan bruka Markdown til formattering."
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "Merkelappar"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr "Separer merkelappar med komma."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr "Nettnamn"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr "Nettnamnet kan ikkje vera tomt"
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr "Nettnamnet (adressetittel) for verket di. Trengst ikkje endrast."
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr "Lisens"
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr "Presentasjon"
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "Heimeside"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr "Adressa inneheld feil"
-#: mediagoblin/edit/forms.py:63
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr "Send meg epost når andre kjem med innspel på verka mine."
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:69
msgid "License preference"
msgstr "Lisens-val"
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:75
msgid "This will be your default license on upload forms."
msgstr "Dette vil vera standardvalet ditt for lisens."
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
-msgstr "Send meg epost når andre kjem med innspel på verka mine."
-
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr "Tittelen kjan ikkje vera tom"
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "Forklaringa til denne samlinga"
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr "Tittel-delen av denne samlinga si adresse. Du treng normalt sett ikkje endra denne."
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr "Gamalt passort"
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr "Skriv inn det gamle passordet ditt for å stadfesta at du eig denne kontoen."
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr "Nytt passord"
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "Passord"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr "Eit innlegg med denne adressetittelen finst allereie."
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
msgid "You are editing another user's media. Proceed with caution."
msgstr "Trå varsamt, du endrar nokon andre sine verk."
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr "La til vedlegg %s."
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr "Du kan berre enda din eigen profil."
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Trå varsamt, du endrar nokon andre sin profil."
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr "Lagra endring av profilen"
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr "Lagra kontoinstellingar"
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr "Du må stadfesta slettinga av kontoen din."
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Du har allereie ei samling med namn «%s»."
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr "Ei samling med den nettadressa finst allereie for denne brukaren."
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr "Du endrar ein annan brukar si samling. Trå varsamt."
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr "Feil passord"
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr "Endra passord"
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr "Cannot link theme... no theme set\n"
@@ -298,19 +328,62 @@ msgid ""
"domain."
msgstr "Finn ikkje CSRF-cookien. Dette er truleg grunna ein cookie-blokkar.
\nSjå til at du tillet cookies for dette domenet."
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr "Orsak, stør ikkje den filtypen :("
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr "klarte ikkje køyra unoconv, sjekk logg-fil"
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr "Skjedde noko gale med video transkodinga"
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr "kom med innspel på innlegget ditt"
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "Brukarnamn"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "Epost"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr "Brukarnamn eller epost"
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr "Stad"
@@ -374,7 +447,7 @@ msgstr "Omdirigerings-URI-en for programmene. Denne feltet krevst%(user_name)s's account"
msgstr "%(user_name)s sin konto"
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr "Endra kontoinstellingar"
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -447,16 +670,16 @@ msgstr "Endra kontoinstellingar"
msgid "Media processing panel"
msgstr "Verkprosesseringspanel"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr "Logg ut"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Legg til verk"
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "Lag ny samling"
@@ -503,6 +726,59 @@ msgstr "Dei siste ti opplastningane"
msgid "No processed entries, yet!"
msgstr "Ingenting prossesert, enno."
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -535,19 +811,15 @@ msgid ""
"a happy goblin!"
msgstr "Hei %(username)s,\n\nfor å endra MediaGoblin-passordet ditt, opna fylgjande URL i ein netlesar:\n\n <%(verification_url)s>\n\nDersom du mistenkjer dette er eit misstak, ignorer eposten og hald fram med å vera ein glad goblin!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "Innlogging feila"
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "Har du ingen konto?"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "Lag ein!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr "Gløymd passordet?"
@@ -556,7 +828,7 @@ msgstr "Gløymd passordet?"
msgid "Create an account!"
msgstr "Lag ein konto."
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr "Opprett"
@@ -590,7 +862,7 @@ msgstr "Lisensiert med MediaGoblin, eit superbra program for å visa fram dine kreative verk."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr "Vil du leggja til eigne verk og innpel, so må du logga inn."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr "Har du ikkje ein enno? Det er enkelt!"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
+msgid ""
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "Opprett ein konto på denne sida\n eller\n Set opp din eigen MediaGoblin-server"
+"\n"
+" Set up MediaGoblin on your own server"
+msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
@@ -630,13 +907,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr "Endrar vedlegg for %(media_title)s"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr "Vedlegg"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr "Legg ved vedlegg"
@@ -653,22 +930,29 @@ msgstr "Bryt av"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "Lagra"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
-msgstr "Endrar passordet til %(username)s"
+msgid "Changing %(username)s's email"
+msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr "Lagra"
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr "Endrar passordet til %(username)s"
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -696,14 +980,14 @@ msgstr "Endrar %(media_title)s"
msgid "Changing %(username)s's account settings"
msgstr "Endrar kontoinnstellingane til %(username)s"
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
-msgstr "Endra passordet ditt."
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
msgid "Delete my account"
msgstr "Slett kontoen min"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
@@ -715,6 +999,36 @@ msgstr "Endrar %(collection_title)s"
msgid "Editing %(username)s's profile"
msgstr "Endrar profilen til %(username)s"
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "%(formatted_time)s sidan"
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -725,8 +1039,7 @@ 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/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr "Last ned"
@@ -750,7 +1063,7 @@ msgid ""
msgstr "Du kan skaffa ein moderne netlesar som kan spela av dette lydklippet hjå http://opera.com/download."
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr "Opphavleg fil"
@@ -759,6 +1072,10 @@ msgstr "Opphavleg fil"
msgid "WebM file (Vorbis codec)"
msgstr "WebM-fil (Vorbis-kodek)"
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr "Oppretta"
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -770,47 +1087,39 @@ msgstr "WebM-fil (Vorbis-kodek)"
msgid "Image for %(media_title)s"
msgstr "Bilete for %(media_title)s"
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr "PDF-fil"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr "Slå av/på rotering"
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr "Perspektiv"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr "Front"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr "Topp"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr "Side"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr "WebGL"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr "Last ned modell"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr "Filformat"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr "Objekthøgd"
@@ -829,8 +1138,8 @@ msgid ""
msgstr "Du kan skaffa deg ein moderne netlesar som kan spela denne videoen hjå http://opera.com eller http://getfirefox.com."
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
-msgstr "WebM fil (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
@@ -856,11 +1165,6 @@ msgstr "%(collection_title)s av %(username)s"
msgid "Edit"
msgstr "Endra"
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr "Slett"
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -915,29 +1219,22 @@ msgstr "%(username)s sine verk"
msgid "â Browsing media by %(username)s"
msgstr "â Ser pÃ¥ %(username)s sine verk"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr "Legg att innspel"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr "Legg til dette innspelet"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "%(formatted_time)s sidan"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr "Lagt til"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr "Oppretta"
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1096,26 +1393,34 @@ msgstr "Merka med"
msgid "Could not read the image file."
msgstr "Klarte ikkje lesa biletefila."
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr "Oops."
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr "Noko gjekk gale"
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr "Ulovleg operasjon"
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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 "Orsak Dave, eg kan ikkje la deg gjera det!<HAL2000>
\nDu prøvde å gjera noko du ikkje har løyve til. Prøvar du å sletta alle brukarkonti no igjen?"
-#: mediagoblin/tools/response.py:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1152,10 +1457,9 @@ msgstr "Innspel"
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
-msgstr "Du kan bruka Markdown til formatterring."
+"You can use Markdown for formatting."
+msgstr ""
#: mediagoblin/user_pages/forms.py:31
msgid "I am sure I want to delete this"
@@ -1177,77 +1481,80 @@ msgstr "-- Vel --"
msgid "Include a note"
msgstr "Legg ved eit notat"
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
-msgstr "kom med innspel på innlegget ditt"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
+msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr "Innspel er avslege"
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr "Vops, innspelet ditt var tomt."
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr "Innspelet ditt er lagt til."
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr "Sjekk filene dine og prøv omatt."
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr "Du må velja eller laga ei samling"
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "«%s» er allereie i samling «%s»"
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "«%s» lagt til samling «%s»"
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr "Du sletta verket."
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "Sletta ikkje verket."
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "Du er i ferd med å sletta ein annan brukar sine verk. Trå varsamt."
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr "Du fjerna fila frå samlinga."
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr "Fila var ikkje fjerna fordi du ikkje var sikker."
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr "Du er i ferd med å fjerna ei fil frå ein annan brukar si samling. Trå varsamt."
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "Samlinga «%s» sletta"
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr "Sletta ikkje samlinga."
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
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 8b31832935cee8ea6eea6a9d6c8bcdcf99364c06..ac4412b2d41fe03f744223d4ddc6c955a85fe601 100644
GIT binary patch
delta 10477
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
delta 5179
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, 2012
+# Daniel KoÄ , 2012
# Sergiusz Pawlowicz , 2013
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-05-27 13:54-0500\n"
-"PO-Revision-Date: 2013-05-28 13:51+0000\n"
-"Last-Translator: Sergiusz Pawlowicz \n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 19:18+0000\n"
+"Last-Translator: cwebber \n"
"Language-Team: Polish (http://www.transifex.com/projects/p/mediagoblin/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,250 +20,280 @@ msgstr ""
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "Użytkownik"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "HasÅo"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "Adres e-mail"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Niestety rejestracja w tym serwisie jest wyÅÄ
czona."
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
-msgstr "Nazwa konta lub adres poczty elektronicznej"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr "Użytkownik lub adres e-mail"
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr "NieprawidÅowa nazwa konta albo niewÅaÅciwy adres poczty elektronicznej."
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr "Niniejsze pole nie jest przeznaczone na adres poczty elektronicznej."
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr "Niniejsze pole wymaga podania adresu poczty elektronicznej."
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "Niestety rejestracja w tym serwisie jest wyÅÄ
czona."
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "Niestety użytkownik o takiej nazwie już istnieje."
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr "Niestety użytkownik z tym adresem e-mail już istnieje."
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "Twój adres e-mail zostaÅ zweryfikowany. Możesz siÄ teraz zalogowaÄ, wypeÅniÄ opis swojego profilu i wysyÅaÄ grafiki!"
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "NieprawidÅowy klucz weryfikacji lub identyfikator użytkownika."
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr "Musisz siÄ zalogowaÄ Å¼ebyÅmy wiedzieli do kogo wysÅaÄ e-mail!"
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr "Twój adres e-mail już zostaŠzweryfikowany!"
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "WyÅlij ponownie e-mail weryfikujÄ
cy."
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr "JeÅli ten adres poczty elektronicznej istnieje (uwzglÄdniajÄ
c wielkoÅÄ liter!), wysÅano na niego list z instrukcjÄ
, w jaki sposób możesz zmieniÄ swoje hasÅo."
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr "Nie potrafiÄ znaleÅºÄ nikogo o tej nazwie użytkownika."
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "WysÅano e-mail z instrukcjami jak zmieniÄ hasÅo."
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr "Nie udaÅo siÄ wysÅaÄ e-maila w celu odzyskania hasÅa, ponieważ twoje konto jest nieaktywne lub twój adres e-mail nie zostaÅ zweryfikowany."
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
msgid "You can now log in using your new password."
msgstr "Teraz możesz siÄ zalogowaÄ używajÄ
c nowego hasÅa."
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "TytuÅ"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr "Opis tej pracy"
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr "Możesz formatowaÄ tekst za pomocÄ
skÅadni \n \n Markdown."
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "Znaczniki"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr "Rozdzielaj znaczniki przecinkami."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr "Slug"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr "Slug nie może byÄ pusty"
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr "Fragment adresu mediów zawierajÄ
cy tytuÅ. Zwykle nie ma potrzeby aby go zmieniaÄ."
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr "Licencja"
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr "Biogram"
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "Strona internetowa"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr "Ten adres zawiera bÅÄdy"
-#: mediagoblin/edit/forms.py:63
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr "Powiadamiaj mnie e-mailem o komentarzach do moich mediów"
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:69
msgid "License preference"
msgstr "Ulubiona licencja"
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:75
msgid "This will be your default license on upload forms."
msgstr "To bÄdzie twoja domyÅlna licencja dla wgrywanych mediów."
-#: 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:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr "TytuÅ nie może byÄ pusty"
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "Opis tej kolekcji"
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr "CzÄÅÄ adresu zawierajÄ
ca tytuÅ. Zwykle nie musisz tego zmieniaÄ."
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr "Stare hasÅo"
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr "Wprowadź swoje stare hasÅo aby udowodniÄ, że to twoje konto."
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr "Nowe hasÅo"
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "HasÅo"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr "Adres z tym slugiem dla tego użytkownika już istnieje."
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
msgid "You are editing another user's media. Proceed with caution."
msgstr "Edytujesz media innego użytkownika. Zachowaj ostrożnoÅÄ."
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr "DodaÅeÅ zaÅÄ
cznik %s!"
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr "Masz możliwoÅÄ edycji tylko wÅasnego profilu."
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Edytujesz profil innego użytkownika. Zachowaj ostrożnoÅÄ."
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr "Zapisano zmiany profilu"
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr "Zapisano ustawienia konta"
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr "Musisz potwierdziÄ, że chcesz skasowaÄ swoje konto."
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Kolekcja \"%s\" już istnieje!"
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
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:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr "Edytujesz kolekcjÄ innego użytkownika. Zachowaj ostrożnoÅÄ."
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr "NieprawidÅowe hasÅo"
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr "Twoje hasÅo zostaÅo zmienione"
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr "Nie można podlinkowaÄ motywu... nie wybrano motywu\n"
@@ -298,19 +328,62 @@ msgid ""
"domain."
msgstr "Ciasteczko CSFR nie jest dostÄpne. Najprawdopodobniej stosujesz jakÄ
Å formÄ blokowania ciasteczek.
Upewnij siÄ, że nasz serwer może zakÅadaÄ ciasteczka w twojej przeglÄ
darce."
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr "NIestety, nie obsÅugujemy tego typu plików :-("
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr "nie daÅo siÄ uruchomiÄ unoconv, sprawdź log"
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr "Konwersja wideo nie powiodÅa siÄ"
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr "komentarze do twojego wpisu"
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "Użytkownik"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "Adres e-mail"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr "Nazwa konta lub adres poczty elektronicznej"
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr "PoÅożenie"
@@ -374,7 +447,7 @@ msgstr "Przekierowanie URI dla aplikacji, to pole\n jest wyma
msgid "This field is required for public clients"
msgstr "To pole jest wymagane dla klientów publicznych"
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr "Klient {0} zostaÅ zarejestrowany!"
@@ -387,59 +460,209 @@ msgid "Your OAuth clients"
msgstr "Twoi klienci OAuth"
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr "Dodaj"
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr "UsuÅ"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "Zaloguj siÄ"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr "Logowanie nie powiodÅo siÄ!"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr "NiewÅaÅciwy plik dla tego rodzaju mediów."
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr "Plik"
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr "Musisz podaÄ plik."
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr "Hura! WysÅano!"
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr "Kolekcja \"%s\" zostaÅa dodana!"
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr "Zweryfikuj swój adres e-mail!"
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr "wyloguj siÄ"
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr "Zaloguj siÄ"
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr "konto %(user_name)s"
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr "ZmieÅ ustawienia konta"
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -447,16 +670,16 @@ msgstr "ZmieÅ ustawienia konta"
msgid "Media processing panel"
msgstr "Panel przetwarzania mediów"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr "Wyloguj siÄ"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Dodaj media"
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "Utwórz nowÄ
kolekcjÄ"
@@ -503,6 +726,59 @@ msgstr "Ostatnie 10 udanych wysyÅek"
msgid "No processed entries, yet!"
msgstr "Na razie nie przetworzono żadnego wpisu!"
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -535,19 +811,15 @@ msgid ""
"a happy goblin!"
msgstr "CzeÅÄ %(username)s,\n\naby zmieniÄ twoje hasÅo dla GNU MediaGoblin, otwórz nastÄpujÄ
cÄ
stronÄ w swojej przeglÄ
darce:\n\n%(verification_url)s\n\nJeÅli sÄ
dzisz, że to pomyÅka, po prostu zignoruj tÄ wiadomoÅÄ i bÄ
dź nadal szczÄÅliwym goblinem!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "Logowanie nie powiodÅo siÄ!"
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "Nie masz jeszcze konta?"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "Utwórz je tutaj!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr "ZapomniaÅeÅ hasÅa?"
@@ -556,7 +828,7 @@ msgstr "ZapomniaÅeÅ hasÅa?"
msgid "Create an account!"
msgstr "Utwórz konto!"
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr "Utwórz"
@@ -590,7 +862,7 @@ msgstr "Opublikowane na licencji MediaGoblin, Åwietne oprogramowanie do publikowania mediów."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
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/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr "Jeszcze go nie masz? To proste!"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
+msgid ""
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "ZaÅóż konto na tym serwerze\n albo\n Uruchom MediaGoblin na swoim wÅasnym serwerze"
+"\n"
+" Set up MediaGoblin on your own server"
+msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
@@ -630,13 +907,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr "Edycja zaÅÄ
czników do %(media_title)s"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr "ZaÅÄ
czniki"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr "Dodaj zaÅÄ
cznik"
@@ -653,22 +930,29 @@ msgstr "Anuluj"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "Zapisz zmiany"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
-msgstr "Zmieniam hasÅo użytkownika %(username)s"
+msgid "Changing %(username)s's email"
+msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr "Zachowaj"
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr "Zmieniam hasÅo użytkownika %(username)s"
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -696,14 +980,14 @@ msgstr "Edytowanie %(media_title)s"
msgid "Changing %(username)s's account settings"
msgstr "Zmiana ustawieÅ konta %(username)s"
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
-msgstr "ZmieÅ swoje hasÅo."
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
msgid "Delete my account"
msgstr "UsuÅ moje konto"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
@@ -715,6 +999,36 @@ msgstr "Edycja %(collection_title)s"
msgid "Editing %(username)s's profile"
msgstr "Edycja profilu %(username)s"
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "%(formatted_time)s temu"
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -725,8 +1039,7 @@ 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/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr "Pobierz"
@@ -750,7 +1063,7 @@ msgid ""
msgstr "ProszÄ pobraÄ przeglÄ
darkÄ, która obsÅuguje \n\tdźwiÄk w HTML5, pod adresem \n\t http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr "Oryginalny plik"
@@ -759,6 +1072,10 @@ msgstr "Oryginalny plik"
msgid "WebM file (Vorbis codec)"
msgstr "plik WebM (kodek Vorbis)"
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr "Utworzono"
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -770,47 +1087,39 @@ msgstr "plik WebM (kodek Vorbis)"
msgid "Image for %(media_title)s"
msgstr "Grafika dla %(media_title)s"
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr "Plik PDF"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr "ObróÄ"
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr "Perspektywa"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr "PoczÄ
tek"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr "Góra"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr "KrawÄdź"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr "WebGL"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr "Pobierz model"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr "Format pliku"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr "WysokoÅÄ obiektu"
@@ -829,8 +1138,8 @@ msgid ""
msgstr "Możesz pobraÄ porzÄ
dnÄ
przeglÄ
darkÄ, która jest w stanie odtworzyÄ ten materiaÅ filmowy, ze strony â http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
-msgstr "plik WebM (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
@@ -856,11 +1165,6 @@ msgstr "%(collection_title)s użytkownika %(username)s<
msgid "Edit"
msgstr "Edytuj"
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr "UsuÅ"
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -915,29 +1219,22 @@ msgstr "media użytkownika %(username)s"
msgid "â Browsing media by %(username)s"
msgstr "â PrzeglÄ
danie mediów użytkownika %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr "Dodaj komentarz"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr "Dodaj komentarz"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "%(formatted_time)s temu"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr "Dodano"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr "Utworzono"
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1096,26 +1393,34 @@ msgstr "Znaczniki:"
msgid "Could not read the image file."
msgstr "Nie udaÅo siÄ odczytaÄ pliku grafiki."
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr "Ups!"
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr "WystÄ
piÅ bÅÄ
d"
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr "Operacja niedozwolona"
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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 "Misiaczku, nie możesz tego uczyniÄ!
PróbowaÅeÅ wykonaÄ dziaÅanie, do którego nie masz uprawnieÅ. Czy naprawdÄ chciaÅeÅ skasowaÄ znowu wszystkie konta?"
-#: mediagoblin/tools/response.py:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1152,10 +1457,9 @@ msgstr "Komentarz"
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
-msgstr "Możesz formatowaÄ przy pomocy skÅadni Markdown."
+"You can use Markdown for formatting."
+msgstr ""
#: mediagoblin/user_pages/forms.py:31
msgid "I am sure I want to delete this"
@@ -1177,77 +1481,80 @@ msgstr "-- wybierz --"
msgid "Include a note"
msgstr "Dodaj notatkÄ"
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
-msgstr "komentarze do twojego wpisu"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
+msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr "Komentowanie jest wyÅÄ
czone."
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr "Ups, twój komentarz nie zawieraÅ treÅci."
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr "Twój komentarz zostaŠopublikowany!"
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr "Sprawdź swoje wpisy i spróbuj ponownie."
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr "Musisz wybraÄ lub dodaÄ kolekcjÄ"
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "\"%s\" już obecne w kolekcji \"%s\""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "\"%s\" dodano do kolekcji \"%s\""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr "Media zostaÅy usuniÄte."
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "Media nie zostaÅy usuniÄte ponieważ nie potwierdziÅeÅ, że jesteÅ pewien."
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "Za chwilÄ usuniesz media innego użytkownika. Zachowaj ostrożnoÅÄ."
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr "Element zostaÅ usuniÄty z kolekcji."
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr "Ten element nie zostaÅ usuniÄty, ponieważ nie zaznaczono, że jesteÅ pewien."
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr "Zamierzasz usunÄ
Ä element z kolekcji innego użytkownika. Zachowaj ostrożnoÅÄ."
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "UsuniÄto kolekcjÄ \"%s\""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr "Ta kolekcja nie zostaÅa usuniÄta, ponieważ nie zaznaczono, że jesteÅ pewien."
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr "Zamierzasz usunÄ
Ä kolekcjÄ innego użytkownika. Zachowaj ostrożnoÅÄ."
diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo
index 5e83a7f261bc6b193b598c1e71b38c414865b909..71aef5b2148fcb0c47c92000eca62612c55f17c4 100644
GIT binary patch
delta 10800
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
o%Mq3T7gH_s#luD<24Kr|1U#0S~6enX7CgbmM
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
Sp;4c0FVkhy`snO+<^KXPx^cn)
diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po
index 0e71a8a2..940e85ca 100644
--- a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-06-16 20:06-0500\n"
-"PO-Revision-Date: 2013-08-24 16:27+0000\n"
-"Last-Translator: Canopus\n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,250 +24,280 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: mediagoblin/auth/forms.py:25
-msgid "Username"
-msgstr "Nome de Usuário"
-
-#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:44
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "Senha"
-
-#: mediagoblin/auth/forms.py:33
-msgid "Email address"
-msgstr "Endereço de email"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Desculpa, o registro está desativado neste momento."
-#: mediagoblin/auth/forms.py:40
-msgid "Username or Email"
-msgstr "Nome de usuário ou email"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
-#: mediagoblin/auth/forms.py:51
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr "Nome de usuário ou email"
-#: mediagoblin/auth/tools.py:42
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr "Nome de usuário ou email inválido."
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr "Este campo não aceita endereços de email."
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr "Este campo requer um endereço de email."
-#: mediagoblin/auth/tools.py:109
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "Desculpe, um usuário com este nome já existe."
-#: mediagoblin/auth/tools.py:113
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr "Desculpe, um usuário com esse email já está cadastrado"
-#: mediagoblin/auth/views.py:43
-msgid "Sorry, registration is disabled on this instance."
-msgstr "Desculpa, o registro está desativado neste momento."
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
-#: mediagoblin/auth/views.py:133
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "O seu endereço de e-mail foi verificado. Você pode agora fazer login, editar seu perfil, e enviar imagens!"
-#: mediagoblin/auth/views.py:139
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "A chave de verificação ou nome usuário estão incorretos."
-#: mediagoblin/auth/views.py:157
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr "Você precisa entrar primeiro para sabermos para quem mandar o email!"
-#: mediagoblin/auth/views.py:165
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr "Você já verificou seu email!"
-#: mediagoblin/auth/views.py:178
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "O email de verificação foi enviado novamente."
-#: mediagoblin/auth/views.py:209
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr "Se esse endereço de email (sensÃvel a maiúsculo/minúsculo!) estiver registrado, um email será enviado com instruções para alterar sua senha."
-#: mediagoblin/auth/views.py:220
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr "Não foi possÃvel encontrar alguém com esse nome de usuário."
-#: mediagoblin/auth/views.py:223
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "Um email foi enviado com instruções para trocar sua senha."
-#: mediagoblin/auth/views.py:230
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr "Não foi possÃvel enviar o email de recuperação de senha, pois seu nome de usuário está inativo ou o email da sua conta não foi confirmado."
-#: mediagoblin/auth/views.py:287
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
msgid "You can now log in using your new password."
msgstr "Agora você pode entrar usando sua nova senha."
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "TÃtulo"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr "Descrição desse trabalho"
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr "Você pode usar\n\nMarkdown para formatação."
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "Etiquetas"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr "Separe as etiquetas com vÃrgulas."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr "Arquivo"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr "O arquivo não pode estar vazio"
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr "A parte do tÃtulo do endereço dessa mÃdia. Geralmente você não precisa mudar isso."
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr "Licença"
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr "Biografia"
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "Website"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr "Este endereço contém erros"
-#: mediagoblin/edit/forms.py:63
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr "Me enviar um email quando outras pessoas comentarem em minhas mÃdias"
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:69
msgid "License preference"
msgstr "Licença preferida"
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:75
msgid "This will be your default license on upload forms."
msgstr "Esta será sua licença padrão nos formulários de envio."
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
-msgstr "Me enviar um email quando outras pessoas comentarem em minhas mÃdias"
-
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr "O tÃtulo não pode ficar vazio"
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "Descrição desta coleção"
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr "A parte do tÃtulo do endereço dessa coleção. Geralmente você não precisa mudar isso."
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr "Senha antiga"
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr "Digite sua senha antiga para provar que esta conta é sua."
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr "Nova senha"
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "Senha"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr "Uma entrada com esse arquivo já existe para esse usuário"
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
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:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr "Você adicionou o anexo %s!"
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr "Você só pode editar o seu próprio perfil."
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
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:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr "As mudanças no perfil foram salvas"
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr "As mudanças na conta foram salvas"
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr "Você precisa confirmar a exclusão da sua conta."
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Você já tem uma coleção chamada \"%s\"!"
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr "Já existe uma coleção com este arquivo para este usuário."
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr "Você está editando a coleção de um outro usuário. Prossiga com cuidado."
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr "Senha errada"
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr "Sua senha foi alterada com sucesso."
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr "Não é possÃvel fazer link de tema... nenhum tema definido\n"
@@ -302,19 +332,62 @@ msgid ""
"domain."
msgstr "Cookie CSFR não está presente. Isso é provavelmente o resultado de um bloqueador de cookies ou algo do tipo.
Tenha certeza de autorizar este domÃnio a configurar cookies."
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr "Desculpe, não tenho suporte a este tipo de arquivo :("
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr ""
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr "Conversão do vÃdeo falhou"
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr "comentou na sua publicação"
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "Nome de Usuário"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "Endereço de email"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr "Nome de usuário ou email"
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr "Localização"
@@ -378,7 +451,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr "Este campo é necessário para clientes públicos"
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr "O cliente {0} foi registrado!"
@@ -391,59 +464,209 @@ msgid "Your OAuth clients"
msgstr "Seus clientes OAuth"
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr "Adicionar"
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr "Apagar"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "Entrar"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr "Autenticação falhou"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr "Arquivo inválido para esse tipo de mÃdia"
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr "Arquivo"
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr "Você deve fornecer um arquivo."
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr "Eba! Enviado!"
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr "Coleção \"%s\" adicionada!"
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr "Verifique seu email!"
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr "sair"
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr "Entrar"
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr "Conta de %(user_name)s"
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr "Mudar configurações da conta"
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -451,16 +674,16 @@ msgstr "Mudar configurações da conta"
msgid "Media processing panel"
msgstr "Painel de processamento de mÃdia"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr "Sair"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Adicionar mÃdia"
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "Criar nova coleção"
@@ -507,6 +730,59 @@ msgstr "Ãltimos 10 envios bem sucedidos"
msgid "No processed entries, yet!"
msgstr "Ainda não há entradas processadas!"
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -539,19 +815,15 @@ msgid ""
"a happy goblin!"
msgstr "Olá %(username)s,\n\npara alterar sua senha do GNU MediaGoblin, abra a seguinte URL\nno seu navegador web:\n\n%(verification_url)s\n\nSe você acha que isso é um erro, desconsidere esse email e continue sendo um goblin feliz"
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "Autenticação falhou"
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "Ainda não tem conta?"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "Crie uma aqui!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr "Esqueceu sua senha?"
@@ -560,7 +832,7 @@ msgstr "Esqueceu sua senha?"
msgid "Create an account!"
msgstr "Criar uma conta!"
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr "Criar"
@@ -594,7 +866,7 @@ msgstr "Lançado sob a MediaGoblin, um programa excelente para hospedar, gerenciar e compartilhar mÃdia."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr "Para adicionar sua própria mÃdia, publicar comentários e mais outras coisas, você pode entrar com sua conta MediaGoblin."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr " Ainda não tem uma conta? à facil!"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "Crie uma conta neste site\nou\nConfigure MediaGoblin em seu próprio servidor"
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
+msgid ""
+"\n"
+" Set up MediaGoblin on your own server"
+msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
@@ -634,13 +911,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr "Editando os anexos de %(media_title)s"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr "Anexos"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:193
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr "Adicionar anexo"
@@ -657,22 +934,29 @@ msgstr "Cancelar"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "Salvar mudanças"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
-msgstr "Alterando a senha de %(username)s"
+msgid "Changing %(username)s's email"
+msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr "Salvar"
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr "Alterando a senha de %(username)s"
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -700,14 +984,14 @@ msgstr "Editando %(media_title)s"
msgid "Changing %(username)s's account settings"
msgstr "Alterando as configurações da conta de %(username)s"
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
-msgstr "Alterar sua senha."
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
msgid "Delete my account"
msgstr "Deletar minha conta"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
@@ -719,6 +1003,36 @@ msgstr "Editando %(collection_title)s"
msgid "Editing %(username)s's profile"
msgstr "Editando perfil de %(username)s"
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "%(formatted_time)s"
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -729,8 +1043,7 @@ msgstr "Etiquetas desta mÃdia: %(tag_name)s"
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr "Baixar"
@@ -754,7 +1067,7 @@ msgid ""
msgstr "Você pode obter um navegador moderno\n »capaz de reproduzir o áudio em \n » http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr "Arquivo original"
@@ -767,13 +1080,6 @@ msgstr "Arquivo WebM (codec Vorbis)"
msgid "Created"
msgstr "Criado"
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "%(formatted_time)s"
-
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -785,47 +1091,39 @@ msgstr "%(formatted_time)s"
msgid "Image for %(media_title)s"
msgstr "Imagem para %(media_title)s"
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr "Arquivo PDF"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr "Alternar Rotação"
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr "Perspectiva"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr "Frente"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr "Cima"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr "Lado"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr "WebGL"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr "Baixar o modelo"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr "Formato de Arquivo"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr "Altura do Objeto"
@@ -844,8 +1142,8 @@ msgid ""
msgstr "Você pode obter um navegador moderno\n capaz de reproduzir este vÃdeo em \n http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
-msgstr "Arquivo WebM (640p, VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
@@ -871,11 +1169,6 @@ msgstr "%(collection_title)s de %(username)s"
msgid "Edit"
msgstr "Editar"
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr "Apagar"
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -930,15 +1223,19 @@ msgstr "MÃdia de %(username)s "
msgid "â Browsing media by %(username)s"
msgstr "â Vendo mÃdia de %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr "Adicionar um comentário"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr "Adicionar este comentário"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr "Adicionado há"
@@ -1100,26 +1397,34 @@ msgstr "Etiquetas"
msgid "Could not read the image file."
msgstr "Não foi possÃvel ler o arquivo de imagem."
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr "Oops"
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr "Um erro ocorreu"
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr "Operação não permitida"
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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 "Me desculpe Dave, não posso deixar você fazer isso!
Você tentou executar uma função sem autorização. Por acaso estava novamente tentando deletar todas as contas de usuários?"
-#: mediagoblin/tools/response.py:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1156,10 +1461,9 @@ msgstr "Comentário"
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
-msgstr "Você pode usar Markdown para formatação."
+"You can use Markdown for formatting."
+msgstr ""
#: mediagoblin/user_pages/forms.py:31
msgid "I am sure I want to delete this"
@@ -1181,77 +1485,80 @@ msgstr "-- Selecionar --"
msgid "Include a note"
msgstr "Incluir uma nota"
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
-msgstr "comentou na sua publicação"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
+msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr "Desculpe, os comentários estão desabilitados."
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr "Ops, seu comentário estava vazio."
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr "Seu comentário foi postado!"
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr "Por favor, verifique suas entradas e tente novamente."
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr "Você deve selecionar ou adicionar uma coleção"
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "\"%s\" já está na coleção \"%s\""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "\"%s\" adicionado à coleção \"%s\""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr "Você deletou a mÃdia."
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "A mÃdia não foi apagada porque você não marcou que tinha certeza."
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "Você vai apagar uma mÃdia de outro usuário. Tenha cuidado."
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr "Você deletou o item da coleção."
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr "O item não foi apagado porque você não marcou que tinha certeza."
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr "Você está prestes a remover um item da coleção de um outro usuário. Prossiga com cuidado."
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "Você deletou a coleção \"%s\""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr "A coleção não foi apagada porque você não marcou que tinha certeza."
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr "Você está prestes a deletar a coleção de um outro usuário. Prossiga com cuidado."
diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo
index 8cfdf3392cd14ca86d5b91208335d407f4a04f2c..6b261faedbc8e83af8705be25a5e06000166b006 100644
GIT binary patch
delta 10536
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
hUwhX9A`iVM>3FK>GKXU}O)lFz+w-n+~1
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
H_3eKHK@dGS
diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po
index af2d94d6..64ba716d 100644
--- a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-05-27 13:54-0500\n"
-"PO-Revision-Date: 2013-05-27 20:40+0000\n"
-"Last-Translator: George Pop \n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,250 +20,280 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "Nume de utilizator"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "ParolÄ"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "Adresa de e-mail"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Ne pare rÄu, dar înscrierile sunt dezactivate pe acest server."
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
-msgstr "Numele de utilizator sau adresa de e-mail"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr "Numele de utilizator sau adresa de e-mail"
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr "Nume de utilizator sau adresÄ de e-mail nevalidÄ."
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr "AceastÄ rubricÄ nu este pentru adrese de e-mail."
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr "AceastÄ rubricÄ trebuie completatÄ cu o adresÄ de e-mail."
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "Ne pare rÄu, dar înscrierile sunt dezactivate pe acest server."
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "Ne pare rÄu, existÄ deja un utilizator cu acelaÈi nume."
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr "ExistÄ deja un utilizator înregistrat cu aceastÄ adresÄ de e-mail."
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "Adresa ta de e-mail a fost verificatÄ. PoÈi sÄ te autentifici, sÄ Ã®Èi completezi profilul Èi sÄ trimiÈi imagini!"
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "Cheie de verificare sau user ID incorect."
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr "Trebuie sÄ fii autentificat ca sÄ Ètim cui sÄ trimitem mesajul!"
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr "Adresa ta de e-mail a fost deja verificatÄ!"
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "E-mail-ul de verificare a fost retrimis."
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr "DacÄ adresa de e-mail este în baza noastrÄ de date, atunci se va trimite imediat un mesaj cu instrucÈiuni pentru schimbarea parolei. ÈineÈi cont de litere mari / litere mici la introducerea adresei!"
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr "Nu existÄ nimeni cu acest nume de utilizator."
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "S-a trimis un e-mail cu instrucÈiuni pentru schimbarea parolei."
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr "E-mailul pentru recuperarea parolei nu a putut fi trimis deoarece contul tÄu e inactiv sau adresa ta de e-mail nu a fost verificatÄ."
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
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:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "Titlu"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr "Descrierea acestui fiÈier"
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr "PoÈi folosi\n \n Markdown pentru formatare."
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "Cuvinte-cheie"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr "Desparte cuvintele-cheie prin virgulÄ."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr "Identificator"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr "Identificatorul nu poate sÄ lipseascÄ"
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr "Partea corespunzÄtoare titlului din adresa acestui fiÈier media. De regulÄ poate fi lÄsatÄ nemodificatÄ."
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr "LicenÈa"
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr "Biografie"
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "Sit Web"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr "AceastÄ adresÄ prezintÄ erori"
-#: mediagoblin/edit/forms.py:63
+#: mediagoblin/edit/forms.py:65
+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:67
+msgid "Enable/Disable insite notifications"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:69
msgid "License preference"
msgstr "LicenÈa preferatÄ"
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:75
msgid "This will be your default license on upload forms."
msgstr "Aceasta va fi licenÈa implicitÄ pe formularele de upload."
-#: 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:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr "Titlul nu poate sÄ fie gol"
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "Descriere pentru aceastÄ colecÈie"
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr "Partea din adresa acestei colecÈii care corespunde titlului. De regulÄ nu e necesar sÄ faci o modificare."
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr "Vechea parolÄ"
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr "Introdu vechea parolÄ pentru a demonstra cÄ eÈti titularul acestui cont."
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr "Noua parolÄ"
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "ParolÄ"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr "ExistÄ deja un entry cu acelaÈi identificator pentru acest utilizator."
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
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:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr "Ai anexat %s!"
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr "Nu poÈi modifica decât propriul tÄu profil."
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Editezi profilul unui utilizator. Se recomandÄ prudenÈÄ."
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr "ModificÄrile profilului au fost salvate"
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr "SetÄrile pentru acest cont au fost salvate"
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr "Trebuie sÄ confirmi Ètergerea contului tÄu."
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Ai deja o colecÈie numitÄ \"%s\"!"
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
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:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr "Lucrezi pe colecÈia unui alt utilizator. Se recomandÄ prudenÈÄ."
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr "ParolÄ incorectÄ"
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr "Parola a fost schimbatÄ cu succes"
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr "Tema nu poate fi ataÈatÄ... nu existÄ o temÄ selectatÄ\n"
@@ -298,19 +328,62 @@ msgid ""
"domain."
msgstr "LipseÈte cookie-ul CSRF. Probabil cÄ blocaÈi cookie-urile.
AsiguraÈi-vÄ cÄ existÄ permisiunea setÄrii cookie-urilor pentru acest domeniu."
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr "Scuze, nu recunosc acest tip de fiÈier :("
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr "unoconv nu poate fi executat; verificaÈi log-ul"
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr "Transcodarea video a eÈuat"
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr "a fÄcut un comentariu la postarea ta"
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "Nume de utilizator"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "Adresa de e-mail"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr "Numele de utilizator sau adresa de e-mail"
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr "Locul"
@@ -374,7 +447,7 @@ msgstr "URI-ul de redirectare pentru aplicaÈii, aceastÄ rubricÄ\n
msgid "This field is required for public clients"
msgstr "AceastÄ rubricÄ este obligatorie pentru clienÈii publici"
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr "Clientul {0} a fost înregistrat!"
@@ -387,59 +460,209 @@ msgid "Your OAuth clients"
msgstr "ClienÈii tÄi OAuth"
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr "AdaugÄ"
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr "Èterge"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "Autentificare"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr "Autentificare eÈuatÄ!"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr "Formatul fiÈierului nu corespunde cu tipul de media selectat."
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr "FiÈier"
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr "Trebuie sÄ selectezi un fiÈier."
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr "Ura! Trimis!"
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr "ColecÈia \"%s\" a fost creatÄ!"
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr "VerificÄ adresa de e-mail!"
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr "IeÈire"
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr "Autentificare"
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr "Contul lui %(user_name)s"
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr "ModificÄ setÄrile contului"
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -447,16 +670,16 @@ msgstr "ModificÄ setÄrile contului"
msgid "Media processing panel"
msgstr "Panou de procesare media"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr "IeÈire"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Trimite fiÈier"
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "CreeazÄ colecÈie nouÄ"
@@ -503,6 +726,59 @@ msgstr "Ultimele 10 upload-uri reuÈite"
msgid "No processed entries, yet!"
msgstr "Nu existÄ Ã®ncÄ niciun entry procesat!"
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -535,19 +811,15 @@ msgid ""
"a happy goblin!"
msgstr "BunÄ, %(username)s\n\nPentru a schimba parola ta la GNU MediaGoblin, acceseazÄ adresa urmÄtoare:\n\n%(verification_url)s\n\nDacÄ ai primit acest mesaj din greÈealÄ, ignorÄ-l Èi fii mai departe un goblin fericit!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "Autentificare eÈuatÄ!"
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "Nu ai un cont?"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "CreeazÄ-l aici!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr "Ai uitat parola?"
@@ -556,7 +828,7 @@ msgstr "Ai uitat parola?"
msgid "Create an account!"
msgstr "CreeazÄ un cont!"
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr "CreeazÄ"
@@ -590,7 +862,7 @@ msgstr "Publicat sub licenÈa MediaGoblin, un software excepÈional pentru gÄzduirea fiÈierelor media."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
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/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr "ÃncÄ nu ai unul? E simplu!"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
+msgid ""
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "CreaÈi un cont pe acest site\n sau\n InstalaÈi MediaGoblin pe serverul dvs."
+"\n"
+" Set up MediaGoblin on your own server"
+msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
@@ -630,13 +907,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr "Editare anexe la %(media_title)s"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr "Anexe"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr "AtaÈeazÄ"
@@ -653,22 +930,29 @@ msgstr "Anulare"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "SalveazÄ modificÄrile"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
-msgstr "Se modificÄ parola pentru %(username)s"
+msgid "Changing %(username)s's email"
+msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr "SalveazÄ"
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr "Se modificÄ parola pentru %(username)s"
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -696,14 +980,14 @@ msgstr "Editare %(media_title)s"
msgid "Changing %(username)s's account settings"
msgstr "Se modificÄ setÄrile contului pentru userul %(username)s"
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
-msgstr "ModificÄ parolÄ."
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
msgid "Delete my account"
msgstr "Èterge contul meu"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
@@ -715,6 +999,36 @@ msgstr "Editare %(collection_title)s"
msgid "Editing %(username)s's profile"
msgstr "Editare profil %(username)s"
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "în urmÄ cu %(formatted_time)s"
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -725,8 +1039,7 @@ msgstr "FiÈier etichetat cu cuvintele-cheie: %(tag_name)s"
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr "Download"
@@ -750,7 +1063,7 @@ msgid ""
msgstr "PoÈi lua un browser modern \n\tcapabil sÄ redea aceastÄ Ã®nregistrare de la \n\t http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr "FiÈierul original"
@@ -759,6 +1072,10 @@ msgstr "FiÈierul original"
msgid "WebM file (Vorbis codec)"
msgstr "FiÈier WebM (codec Vorbis)"
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr "Creat"
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -770,47 +1087,39 @@ msgstr "FiÈier WebM (codec Vorbis)"
msgid "Image for %(media_title)s"
msgstr "Imagine pentru %(media_title)s"
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr "FiÈier PDF"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr "Rotire"
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr "PerspectivÄ"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr "Din faÈÄ"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr "De sus"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr "Lateral"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr "WebGL"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr "DescarcÄ modelul"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr "Formatul fiÈierului"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr "ÃnÄlÈimea obiectului"
@@ -829,8 +1138,8 @@ msgid ""
msgstr "PuteÈi obÈine un browser Web modern care poate reda aceastÄ Ã®nregistrare de la http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
-msgstr "FiÈier WebM (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
@@ -856,11 +1165,6 @@ msgstr "%(collection_title)s de %(username)s"
msgid "Edit"
msgstr "Editare"
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr "Èterge"
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -915,29 +1219,22 @@ msgstr "FiÈierele media ale lui %(username)s"
msgid "â Browsing media by %(username)s"
msgstr "â FiÈierele media ale lui %(username)s
"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr "AdaugÄ un comentariu"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr "Trimite acest comentariu"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "în urmÄ cu %(formatted_time)s"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr "AdÄugat"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr "Creat"
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1096,26 +1393,34 @@ msgstr "Etichetat cu cuvintele-cheie"
msgid "Could not read the image file."
msgstr "FiÈierul cu imaginea nu a putut fi citit."
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr "Hopa!"
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr "S-a produs o eroare"
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr "OperaÈia nu este permisÄ"
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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 "Ãmi pare rÄu, Dave, nu te pot lÄsa sÄ faci asta!
Ai încercat sÄ faci o operaÈie nepermisÄ. Ai încercat iar sÄ Ètergi toate conturile utilizatorilor?"
-#: mediagoblin/tools/response.py:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1152,10 +1457,9 @@ msgstr "Comentariu"
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
-msgstr "PoÈi folosi Markdown pentru formatare."
+"You can use Markdown for formatting."
+msgstr ""
#: mediagoblin/user_pages/forms.py:31
msgid "I am sure I want to delete this"
@@ -1177,77 +1481,80 @@ msgstr "-- SelecteazÄ --"
msgid "Include a note"
msgstr "AdaugÄ o notiÈÄ"
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
-msgstr "a fÄcut un comentariu la postarea ta"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
+msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr "Comentariile sunt dezactivate."
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr "Hopa, ai uitat sÄ scrii comentariul."
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr "Comentariul tÄu a fost trimis!"
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr "VerificÄ datele Èi încearcÄ din nou."
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr "Trebuie sÄ alegi sau sÄ creezi o colecÈie"
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "\"%s\" este deja în colecÈia \"%s\""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "\"%s\" a fost adÄugat la colecÈia \"%s\""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr "Ai Èters acest fiÈier"
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "FiÈierul nu a fost Èters deoarece nu ai confirmat cÄ eÈti sigur."
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "UrmeazÄ sÄ Ètergi fiÈierele media ale unui alt utilizator. Se recomandÄ prudenÈÄ."
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr "Ai Èters acest articol din colecÈie."
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr "Articolul nu a fost Èters pentru cÄ nu ai confirmat cÄ eÈti sigur(Ä)."
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr "UrmeazÄ sÄ Ètergi un articol din colecÈia unui alt utilizator. Se recomandÄ prudenÈÄ."
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "Ai Èters colecÈia \"%s\""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr "ColecÈia nu a fost ÈtearsÄ pentru cÄ nu ai confirmat cÄ eÈti sigur(Ä)."
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr "UrmeazÄ sÄ Ètergi colecÈia unui alt utilizator. Se recomandÄ prudenÈÄ."
diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo
index ed28ff432a728a62a48609a684536978b279fc07..333470199d09bf3f040b429ab411b0830f9b60e6 100644
GIT binary patch
delta 10551
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
F^FJI}89o32
delta 5127
zcmciEjaQUa9>DQC1B&5GNPs9H1BwdCiwG!+FZhC}NRo)D6^=3v1IW-Yil{hNy6TpZ
zTwOEFFw?E9jrK8*+9rFl%sj0OmFp=@*K(^Z%ROx`mYMtg^-QO;|G;v9&%KxDxzGLm
ze)m31%K_`j>lWXI@Zjx=ub=se<)>E<>HYTg)2&Ly(Y=B37!#&c29CuESc6gcJPyF)
z7=af891vWdEj9T
z!cOEF>Rs%OmyvJvHNW~`NTgD?U=+%AHoOf-U>}~ZrqW1epcK2|+Q0?t1O3M^hw
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:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1152,10 +1457,9 @@ msgstr "ÐомменÑиÑоваÑÑ"
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
-msgstr "ÐÐ»Ñ ÑазмеÑки можеÑе иÑполÑзоваÑÑ ÑзÑк Markdown."
+"You can use Markdown for formatting."
+msgstr ""
#: mediagoblin/user_pages/forms.py:31
msgid "I am sure I want to delete this"
@@ -1177,77 +1481,80 @@ msgstr "-- ÐÑбеÑиÑе --"
msgid "Include a note"
msgstr "ÐÑимеÑание"
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
-msgstr "оÑÑавил комменÑаÑий к ваÑÐµÐ¼Ñ ÑайлÑ"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
+msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr "Сожалеем: возможноÑÑÑ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¾ÑклÑÑена."
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr "Ðй, Ð²Ð°Ñ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑаÑий бÑл пÑÑÑ."
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr "ÐÐ°Ñ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑаÑий ÑазмеÑÑн!"
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr "ÐожалÑйÑÑа, пÑовеÑÑÑе введÑнное и попÑобÑйÑе еÑÑ Ñаз."
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr "ÐеобÑ
одимо вÑбÑаÑÑ Ð¸Ð»Ð¸ добавиÑÑ ÐºÐ¾Ð»Ð»ÐµÐºÑиÑ"
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "«%s» â Ñже в коллекÑии «%s»"
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "«%s» добавлено в коллекÑÐ¸Ñ Â«%s»"
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr "ÐÑ Ñдалили Ñайл."
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "Файл не ÑдалÑн, Ñак как Ð²Ñ Ð½Ðµ подÑвеÑдили ÑÐ²Ð¾Ñ ÑвеÑенноÑÑÑ Ð³Ð°Ð»Ð¾Ñкой."
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "ÐÑ Ð½Ð° поÑоге ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ñайла дÑÑгого полÑзоваÑелÑ. ÐÑдÑÑе оÑÑоÑожнÑ."
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr "ÐÑ Ð¸ÑклÑÑили Ñайл из коллекÑии."
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr "Файл не иÑклÑÑÑн из коллекÑии, Ñак как Ð²Ñ Ð½Ðµ подÑвеÑдили ÑÐ²Ð¾Ñ Ð½Ð°Ð¼ÐµÑение оÑмеÑкой."
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr "ÐÑ Ð½Ð° поÑоге иÑклÑÑÐµÐ½Ð¸Ñ Ñайла из коллекÑии дÑÑгого полÑзоваÑелÑ. ÐÑдÑÑе оÑÑоÑожнÑ."
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "ÐÑ Ñдалили коллекÑÐ¸Ñ Â«%s»"
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr "ÐоллекÑÐ¸Ñ Ð½Ðµ Ñдалена, Ñак как Ð²Ñ Ð½Ðµ подÑвеÑдили ÑÐ²Ð¾Ñ Ð½Ð°Ð¼ÐµÑение оÑмеÑкой."
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr "ÐÑ Ð½Ð° поÑоге ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ ÐºÐ¾Ð»Ð»ÐµÐºÑии дÑÑгого полÑзоваÑелÑ. ÐÑдÑÑе оÑÑоÑожнÑ."
diff --git a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo
index fd48a37f3f9684412d7b9823e2c862b6301c8234..07717f03e3958ecae0edfe9fe22e70eae04b506f 100644
GIT binary patch
delta 10507
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
H5_5k_VTr7ECUMf&}5x6?m6(@c`jId|_p
zkKgZiZt~&{*ZY5Rh0i8LKdkurk)Jevx^BF!473m63TrB_QFvZ$NZ{{Miv*Uup_RI-0;e+L$F
z{c&{TdpI5Yvx)-rq73{5%0!2-D;_~v;0a{y>J5ApKfzAe+()TQ=2z=!@U8ani?P*V
z9EzvWz#AwbOGze-I2aj2jlvjoV?I`5e{99oxDRDx=_$^HccLt$5@ntm49m(}Xvjc6
zLs{82BrEDsln0*0XgrFtvv!n;P9t-uD=4{-;g?*`M9Fz6N(!cCBa2aLZAD+=
z&*s!-F35wsaR?qm$>l|qNL)weQ2kS#RE$Mgu!S;kGs?o&qU>xlN-7_ZT;GS&=pVun
zcmvnrpfuwD0gb&ZryAE#>cjCYN=Rc_RXR?@vA6`+;|^@WK71$(dkE!}Jd09XCsB6(
z2@b%^n2GU*6RA9u4OE0_NQmd6gv^VQf&j`5EhwLFKpA*DO75RQ##F~pQurxK%DzO2
zNK}Rs>KK%X6H&$)gYx`zB&aIvp&>b3ixTpOQC7ScC0Bn$sp>N*Aw7$-(+en}j$(9K
zcrwcK8IgWY#IY!;DMd-;OuQePkmtkdCJk9YFJ_&DBTzzZq3rA#l!Y9|t#|?@LURW?
zpzNa8!;ObsAL06QO2uAZdKuk2QbX$)VnmQ@H@N@
zD;P~)!KZO4-onwibfi-Q8W+=l6eZ_3umg5tR@q@JcE%nkDM*eu45bLiqikeWHt{!T
z)N?^5+=3nPFv^OLMQ;2UW9VN;8Q>3er*TpMY#$EyOw4if;S}C*#0eP5{ZxD8)H6KCW(wetc>Xx~OTUf&~Spb~hA
zjKd<79fweAqzz^KV__NzG%lg+cEeN~%s_BEEwM@nYoj?Ijd_m)tZ+=Nmz&*B(7j56?7D53AgFIngUlxjCoPLU5K6=Cd%51}md5p?50${AMbDk?>cVF<3
z04oBYQ
z{CWKtS+weMw^Nk!P$IDvhoOz~W;}~tOr5RNGHgZJ$Ys2pbL>Yyx=Q~4qmfBN240C1
z@fgY*?iQMuI>%YS29yV%L*7B^&4^v+I)B}!qs{dPu@EQCbDnEK8Sg2SjlPa~cnQOU
zX{66rip{C1xDj{YSWH`>ln3V^*-$T|ymC7&bpBh8L#gtWC`GpsJK$za!Ur%D_hL4l
zz`l4LWkK=x5Pz9y#68X%&qOJjo!B3Dqdag7CFdVv0)Bz<_#FAclk0UUl#woIiD3Pc^3H5rE
z2yDboxE;IWE|e4Qoa
z7@Uw>*{^{gffl#fVpf!=AfYgv(6g~nSmv%0=}$Zrfy3d*1-zI
z>iEPF8O`1m-s}dm*6XRWs(oI6wiT$$aeHc3c>Q&5t2t!p`H3TRc2Yn6nY*h!AnExi
zeI+?h=cK%;&kdTY8~SRUliFMVBK206Mpn~o1!}YPSF=*|;k2x6{U+Hv`&GDfa=KUV
zN?)c280+*?Mukq!D6}_Z?258e2L+;%tW_aZZq?N>qv7=%%RFA6S(~9x4Y7Jwcp6Mq
zVKy888C(B)s8?raZAl1tWVeRj3K<@s&uTVnb!eE!zBDW^%B~z46QyV5Hs}kvFU41R
z>gvo|quCp(SG0rnPewoJ((e2-y0Bn`9$nbSe!8HsL)W@GpK07}g*+isCl-y@twmcp
z73SwQ-eK5r8%szyNdNci!Xh4$v
z`DDWtTQG9;7-Ll4xPpA$t*n13-LXdQm~r`IhUfAXTkZ*lMpgwp{-DnjvI66b22UWw
z&d0CzgaTGgeYVptscRq<*)>*!y}Yca%bqgL>++BH82@M5i|4k4nyi5L_H%`yT%ab9|1cIM%rR)%-*6k9h{GTO~SzN)6JWVq6Oev*lw@XRJ
zZ=ys)eyhO)W;FTHdgYFAa`rwRl`r3@IbkCWe>&%K|`+XPmI>({w-+47Tm=!z-!&K2i7^jzp^^tT^ji2*AlPp{Hzt)L#*
zcqlH|ex%w87(*jf^I>B!%6=_)!lkpCp6)rb{kO-Dn#cDTO)aaAA7zWWvZ+|_ZyIiY
Y+??mqn_Jv^*y?_|Vf9fxY0cGt1MXl_Gynhq
diff --git a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po
index e4d1bacc..79b000c1 100644
--- a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# martin , 2013
-# martin , 2012-2013
+# martin, 2013
+# martin, 2012-2013
# Morten Juhl-Johansen Zölde-Fejér , 2012
# Olle Jonsson , 2012
# ttrudslev , 2012
-# martin , 2011-2012
+# martin, 2011-2012
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-05-27 13:54-0500\n"
-"PO-Revision-Date: 2013-05-28 07:47+0000\n"
-"Last-Translator: martin \n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 19:18+0000\n"
+"Last-Translator: cwebber \n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/mediagoblin/language/sk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,250 +24,280 @@ msgstr ""
"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "PoužÃvateľské meno"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "Heslo"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "Email adresse"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "PrepáÄ, registrácia na danej inÅ¡tancii nie je povolená."
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
-msgstr "Použivateľské meno alebo e-mail"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr "PoužÃvateľské meno alebo e-mailová adresa"
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr "Nesprávne použÃvateľské meno alebo e-mailová adresa."
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr "Toto pole neakceptuje e-mailové adresy."
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr "Toto pole vyžaduje e-mailovú adresu."
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "PrepáÄ, registrácia na danej inÅ¡tancii nie je povolená."
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "PrepáÄ, rovnaké použÃvateľské meno už existuje."
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr "PrepáÄ, rovnaká e-mailová adresa už bola použitá na vytvorenie úÄtu."
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "Tvoja e-mailová adresa bola overená. Teraz sa môžeš prihlásiť, upravovať profil a vkladať výtvory!"
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "Overovacà kľúÄ, prÃpadne použÃvateľské meno je nesprávne."
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr "Je potrebné prihlásiť sa, aby sme vedeli kam máme e-mail zaslať!"
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr "Už máš overenú e-mailovú adresu!"
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "Opätovne zaslať overovacà e-mail."
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr "Pokiaľ daná e-mailová adresa (citlivá na veľkosÅ¥ pÃsma!) je registrovaná, e-mail z inÅ¡trukciami pre zmenu tvojho hesla bol zaslaný."
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr "Nemožno nájsÅ¥ nikoho z daným použÃvateľským menom."
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "E-mailová správa z inštrukciami na zmenu tvojho hesla bola zaslaná."
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr "Nebolo možné zaslaÅ¥ e-mail na opätovné zÃskanie zabudnutého hesla, nakoľko tvoje použÃvateľské meno je neaktÃvne, prÃpadne e-mailová adresa nebola úspeÅ¡ne overená."
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
msgid "You can now log in using your new password."
msgstr "Už môžeÅ¡ použiÅ¥ nové heslo pri prihlasovanÃ."
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "Titulok"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr "Popis výtvoru"
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr "MôžeÅ¡ využiÅ¥\n \n Markdown pre formátovanie prÃspevku."
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "Å tÃtky"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr "Oddeľ Å¡tÃtky pomocou Äiarky."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr "Unikátna ÄasÅ¥ adresy"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr "Unikátna ÄasÅ¥ adresy nesmie byÅ¥ prázdna"
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr "Titulná ÄasÅ¥ adresy daného média. Zmena poľa nepovinná."
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr "Licencia"
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr "Bio"
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "Webstránka"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr "Daná adresa obsahuje chybu"
-#: mediagoblin/edit/forms.py:63
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr "ZaÅ¡li mi e-mail keÄ ostatnà okomentujú môj výtvor"
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:69
msgid "License preference"
msgstr "Preferencia licencie"
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:75
msgid "This will be your default license on upload forms."
msgstr "Nasledovná licencia bude použitá ako východzia pre všetky tvoje výtvory."
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
-msgstr "ZaÅ¡li mi e-mail keÄ ostatnà okomentujú môj výtvor"
-
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr "Titulok nesmie byť prázdny."
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "Popis danej kolekcie"
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr "Titulná ÄasÅ¥ adresy danej kolekcie. Zmena poľa nepovinná."
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr "Staré heslo"
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr "Vlož svoje staré heslo na dôkaz toho, že vlastnÃÅ¡ daný úÄet."
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr "Nové heslo"
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "Heslo"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr "Položku s rovnakou unikátnou ÄasÅ¥ou adresy už niekde máš."
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
msgid "You are editing another user's media. Proceed with caution."
msgstr "UpravujeÅ¡ výtvory iného použÃvateľa. Pristupuj zodpovedne. "
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr "PrÃloha %s pridaná!"
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr "Môžeš upravovať iba svoj vlastný profil."
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
msgid "You are editing a user's profile. Proceed with caution."
msgstr "UpravujeÅ¡ profil iného použÃvateľa. Pristupuj zodpovedne. "
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr "Zmeny v profile uložené"
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr "Nastavenia úÄtu uložené"
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr "PotrebujeÅ¡ potvrdiÅ¥ odstránenie svojho úÄtu."
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Už máš kolekciu nazvanú ako \"%s\"!"
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr "Kolekcia s týmto Å¡tÃtkom už máš."
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr "UpravujeÅ¡ kolekciu iného použÃvateľa. Pristupuj zodpovedne. "
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr "Nesprávne heslo"
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr "Tvoje heslo bolo úspešne zmenené"
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr "Nemožno pripojiť tému... téma nenastavená\n"
@@ -302,19 +332,62 @@ msgid ""
"domain."
msgstr "CSRF \"cookie\" neprÃtomný. Toto vidÃÅ¡ najskôr ako výsledok blokovania \"cookie\" súborov a pod.
Uisti sa, že máš povolené ukladanie \"cookies\" pre danú doménu."
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr "PrepáÄ, nepodporujem tento typ súborov =("
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr "beh unoconv zlyhal, preskúmajte log záznam"
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr "Konvertovanie videa zlyhalo"
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr "okmentoval tvoj prÃspevok"
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "PoužÃvateľské meno"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "Email adresse"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr "Použivateľské meno alebo e-mail"
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr "Poloha"
@@ -378,7 +451,7 @@ msgstr "Presmerovacie URI pre aplikácie, toto pole\nje požadované%(user_name)s's account"
msgstr "ÃÄet použÃvateľa %(user_name)s"
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr "ZmeniÅ¥ nastavenia úÄtu"
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -451,16 +674,16 @@ msgstr "ZmeniÅ¥ nastavenia úÄtu"
msgid "Media processing panel"
msgstr "Sekcia spracovania výtvorov"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr "Odhlásiť sa"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Pridať výtvor"
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "Vytvoriť novú kolekciu"
@@ -507,6 +730,59 @@ msgstr "Posledných 10 úspeÅ¡ných nahratÃ"
msgid "No processed entries, yet!"
msgstr "Zatiaľ žiadne spracované položky!"
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -539,19 +815,15 @@ msgid ""
"a happy goblin!"
msgstr "Ahoj %(username)s,\n\npre zmenu svojho hesla k GNU MediaGoblin úÄtu, otvor nasledujúci odkaz vo svojom prehliadaÄi:\n\n%(verification_url)s\n\nPokiaľ si myslÃÅ¡, že doÅ¡lo k omylu, tak jednoducho ignoruj túto správu a buÄ Å¡Å¥astným goblinom!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "Prihlásenie zlyhalo!"
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "EÅ¡te stále nemáš úÄet?"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "Vytvor si jeden tu!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr "Zabudnuté heslo?"
@@ -560,7 +832,7 @@ msgstr "Zabudnuté heslo?"
msgid "Create an account!"
msgstr "Opret en konto!"
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr "Vytvoriť"
@@ -594,7 +866,7 @@ msgstr "Uvoľnené pod MediaGoblin, výnimoÄne skvelý kus softvéru na hostovanie médiÃ."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr "Pre pridanie vlastných výtvorov, komentárov a viac.. sa prihlás zo svojim MediaGoblin úÄtom."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr "Har du ikke en endnu? Det er let!"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
+msgid ""
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "VytvoriÅ¥ úÄet na tejto stránke\n alebo\n NastaviÅ¥ MediaGoblin na vlastnom serveri"
+"\n"
+" Set up MediaGoblin on your own server"
+msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
@@ -634,13 +911,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr "Ãprava prÃloh pre %(media_title)s"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr "PrÃlohy"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr "PridaÅ¥ prÃlohu"
@@ -657,22 +934,29 @@ msgstr "Zrušiť"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "Uložiť zmeny"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
-msgstr "MenÃm heslo použÃvateľa %(username)s"
+msgid "Changing %(username)s's email"
+msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr "Uložiť"
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr "MenÃm heslo použÃvateľa %(username)s"
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -700,14 +984,14 @@ msgstr "Ãprava %(media_title)s"
msgid "Changing %(username)s's account settings"
msgstr "MenÃm nastavenia úÄtu použÃvateľa %(username)s"
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
-msgstr "Zmeniť svoje heslo."
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
msgid "Delete my account"
msgstr "OdstrániÅ¥ môj úÄet"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
@@ -719,6 +1003,36 @@ msgstr "Ãprava %(collection_title)s"
msgid "Editing %(username)s's profile"
msgstr "Ãprava profilu, ktorý vlastnà %(username)s "
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "pred %(formatted_time)s "
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -729,8 +1043,7 @@ 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/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr "Stiahnuť"
@@ -754,7 +1067,7 @@ msgid ""
msgstr "MôžeÅ¡ zÃskaÅ¥ moderný prehliadaÄ, ktorý\n\ttento zvuk hravo prehrá \n\t http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr "Originálny súbor"
@@ -763,6 +1076,10 @@ msgstr "Originálny súbor"
msgid "WebM file (Vorbis codec)"
msgstr "WebM súbor (Vorbis kodek)"
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr "Vytvorené"
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -774,47 +1091,39 @@ msgstr "WebM súbor (Vorbis kodek)"
msgid "Image for %(media_title)s"
msgstr "Obrázok pre %(media_title)s"
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr "PDF súbor"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr "Zapnúť rotáciu"
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr "PerspektÃva"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr "Äelo"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr "Vrch"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr "Strana"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr "WebGL"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr "Stiahnuť model"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr "Súborový formát"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr "Výška objektu"
@@ -833,8 +1142,8 @@ msgid ""
msgstr "MôžeÅ¡ zÃskaÅ¥ moderný prehliadaÄ, ktorý\n\ttento video súbor hravo prehrá na \n\t http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
-msgstr "WebM súbor (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
@@ -860,11 +1169,6 @@ msgstr "%(collection_title)s od %(username)s"
msgid "Edit"
msgstr "Upraviť"
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr "Odstrániť"
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -919,29 +1223,22 @@ msgstr "Výtvory, ktoré vlastnà %(username)s"
msgid "â Browsing media by %(username)s"
msgstr "â Prehliadanie výtvorov od %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr "Pridať komentár"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr "Pridať tento komentár"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "pred %(formatted_time)s "
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr "Pridané"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr "Vytvorené"
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1100,26 +1397,34 @@ msgstr "OznaÄené ako"
msgid "Could not read the image file."
msgstr "Nemožno preÄÃtaÅ¥ súbor obrázka."
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr "Hopla!"
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr "Vyskytla sa chyba"
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr "Nepovolená operácia"
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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 "PrepÃ¡Ä ÄloveÄe, toto nesmieÅ¡!
Práve si chcel vykonaÅ¥ funkciu, na ktorú nemáš oprávnenie. Opäť si sa pokúšal odstrániÅ¥ vÅ¡etky použÃvateľské úÄty?"
-#: mediagoblin/tools/response.py:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1156,10 +1461,9 @@ msgstr "Komentár"
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
-msgstr "MôžeÅ¡ využiÅ¥ Markdown pre formátovanie prÃspevku."
+"You can use Markdown for formatting."
+msgstr ""
#: mediagoblin/user_pages/forms.py:31
msgid "I am sure I want to delete this"
@@ -1181,77 +1485,80 @@ msgstr "-- Vybrať --"
msgid "Include a note"
msgstr "Pridať poznámku"
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
-msgstr "okmentoval tvoj prÃspevok"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
+msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr "PrepáÄ, komentovanie je vypnuté."
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr "Hopla, tvoj komentár bol prázdny."
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr "Tvoj komentár bol pridaný!"
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr "ProsÃm skontroluj svoje položky a skús znova."
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr "MusÃÅ¡ vybraÅ¥, prÃpadne pridaÅ¥ kolekciu"
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "\"%s\" sa už nachádza v kolekcii \"%s\""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "\"%s pridané do kolekcie \"%s\""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr "Výtvor bol tebou odstránený."
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "Výtvor nebol odstránený, nakoľko chýbalo tvoje potvrdenie."
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "Chystáš sa odstrániť výtvory niekoho iného. Pristupuj zodpovedne. "
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr "Položka bola z kolekcie odstránená."
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr "Položka nebola odstránená, nakoľko polÃÄko potvrdenia nebolo oznaÄné."
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr "Chystáš sa odstrániÅ¥ položku z kolekcie iného použÃvateľa. Pristupuj zodpovedne. "
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "Kolekcia \"%s\" bola úspešne odstránená."
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr "Kolekcia nebola odstránená, nakoľko polÃÄko potrvdenia nebolo oznaÄené."
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr "Chystáš sa odstrániÅ¥ kolekciu iného použÃvateľa. Pristupuj zodpovedne. "
diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo
index 199e761cfc73a72c8d77e73d29acedf2c69b4ce3..3ca9a4040579e5df98c4c9b8f217c67014f9dcd7 100644
GIT binary patch
literal 30652
zcmeI43zS{edEbxC%Nm}-81wcSVOcXUb4L;GnU4ZzGMy8c75Qh;#2fGjnF{J?C=I
zxigGxK=BH)<3eqN;~E#^Dr?z!)p3%A?K*V1p+$CZNJvUo;xw+4;*!P<#*R}rZHe9f
z{(J9pAES{Npf=D9OU!T1Yd^mI?Qehk+k4Nq&OY%MJ^ow&CeOPFp3|kP)_
p7S=+f}7#F@LqTUd>HbI_a%4#DfkwyzYWRSdmf$!
zUw|v&i|{H~AdvxBhBw2H!4L4k_uw^LPoHP=`7L+?*S`lZgipb<;9tYj;s1il{}c+Z
z>xd4xS9R(uhmo
z5PUnl!|@kj57&pG+U@Jmhkp$v_eI=P)1M2Ke>Xe@u7+pA>)=v247=eJyb^u_UIPCB
z9)Qn7$!m<8D$hru%J~UMlX|}nC5OkM(*O5R@BK%}Kkq;DL(ipDi@{>3?=OWX!c|am
zxEAXDt&pbmMj@j2?tzHbd&oV16iUyYfokt>LZ$OJQ1$*kRDFH~5ry{--^y(bRQh}1
zGMGZO|38Onr^8V4{5({?-+-6GA3*8Dxg@$0?u4r6L8yE`2vz?3q2%!pRJxyc_rCzQ
za{V~$gNta)yWlGLr|?l&g!hrzaXZ0AZ@VFNaEJEtI@&hH9t%?s>&s-wjp1f8zKXQ2G5aRQmq~
zs@yL^^@DR!O6f@fsythv>bVyx{Ta9j9)c&qk3h-i<52Z`6#DQn_!jt0sP=o#@kOY7
z7hh)O+XI!~_3ru>sP7t3`QPoX?{oY`D7|s;Wbd@e-cVh{|HL%{|!pMUH$g`GvNxZFM?`^A*g(Ach6^_%5wMHpTiPd#Y5@sC!yNwSK+DfYf$BU29mY+4Y(GbLZ?(do1xl&2HpTa
z1vkU*z%6iqm!yYNFoqAp4e-qvJ?YaXDEa&>9Dxlu1fPVG^LbQS^<4=OiMJmfhWA62
zX8+f(`*06D7oi=5lMqpP&%@i{MKnG|_U?kx+uww@!7suS
z;M=aTayTDK|1N=x;WEc-;JIAi042X7JR2T_=fMY|5C0`pzJCCf&yS$KJ7LhicL6+w
z>notXzZRYWhoI8E6{?=^g{ZRk3Ah*jJE-&MR7@|_%2O$5vFY|+@@?L~0$4WY<z5fur82&y~
z`+f(iz0Rca%0Gt6@1H{D{{_dV;0auR8!m$X6-vMV7E12_1FE0@7^;0vqH^M?j*Fqv
zeLFl6u5;W7mEJap$h_U~RD=GZ5zaTyKFY|Lsuay&KXMy+61@K+)9Jm3#9qxl~fiZj&oQ9{t8MqQ2f^-q@%TV(E9=sV|w%z)D_d-<9JDpCe
ze73?9;BD|iScGT6yW#2Z!%+Eu%3c39lwSU>yM7w#{r?2t3SV%~-@L=>!D1*mUJLbn
zgS*}fC9hlHD5*6A-E0dy=UPP_&k)H&)j9X4EAun9;)5Op$`wi)8H>drTZvU{{IG^
z0{;Y_3BLuUr!T;6c+Rl(GgiS%xSoUu;D=x@Jn235`vJI^>#O10;C6Tx+z*w04N70{
zgi7Zg_xusKnCs6&)$?(9BK!|f^7=EV_n(96hbQi~dU-Ka`&?2`_IE=T%Un)SNpGmD*qZNdG3Ul!YRj3!c|;<1+IiYgsNu`
z##`lB4pshZpyaU`D&1S${Qz#|x(Wy27vO{NIryh=W-q!8-?Pu^+oSNuT>mA!68^=F
zwm+WpGu9ut65h@ID*QS4JXHUUZ?byuLHJg#KMN(F-+`*nlThXVE>!>Z>3pikweW1X
z5vo4>-2MGf@*8v4KM(cZeNcM+X?OiOsQ&r8P+Q2GA@Tnx{;#ip|as-4zDwbLf3
z=kIaXB`7_wIX(!L-xs0E@g%$e{uNX|c+=0?c0C`eJS(BxWvKph2UNcAh3Y2<
zq4e_+=)=!I)%&YZ?f10fbMRcQUxeqwvv0Ne^+8>4hWc(lRQ}`cdJ3xj?}5^bdtnd!
zC{+5t0}sJJa@RNBX49?0>$!gju7*!S>E)aE+xol}ewb??s{FqR-wD42)jz)pRnL=e
zx8I!#S8#n1l$?j)dGK~9`OH9-=MdC)55srB!%*oz4iUBYd+;;xoq?^#*Wp!M{~avA
z-l82xeg>}N`Xg`~d>UQ>&nsEE?|^!L0`|j);N|dZ5LNO14)V_%DqFq%ZFn))k3-4v
zFQCfxH&E&P0Ir4Iq0MJMyp-z);SKOha5Fq%)cSqf;YD131jg`la09$(%(mxkQ1ZDG
zj=+z?A^4noe&x8W-w;&!?}vxsV^Dt2t&z1mAB4*1*PzlmvVjKg!O+mz=K@B
zA1b{QCTSbE0;-=r08fTTAgbU!1y6vNS8RI?K<_XnjcO5!E{
zcs(3lyJS4eYJ&p<)vz1|V@a_R#f5qpl(X@$oRrc+QXd;wvTh{I{6@{+sh75zm;5C5
zXOc$UPo`r(4eL{3ea%3yu9fY&jUyjj~WLH;b6mJwHqI
zUYMpfS@+F)-&?XYUE&Aja#+?orKC~`O$B^Ca8D~L@{AwFM?GKK)B0k67G;&NH}!j#
z_B1GS98|elmbQJ=>&^K=amGiCR$%tq{f&C1H(j!>JtZT6r9Goby&7a$SSCMZ;3HR(
zJw}e{>_?_0X5XyUlhLRWdOh{9noNbg*wOxeeak_{!GfxCQIT#k}uNN7=Za1!L{<=CUPjE_zcV={0FqPvWt48u#{D=pBDTtfOmiLQlFd6#w@Qy~9W~o#QmG`#}?d{O=C{D8=E`>Zqdr8KR
zlguxMN2M0USy(THHJaT=Ta=a>oVHi~Jz-(2;JQhFN?~2WdJAicb$_7M6Y|34bsKKb
zBTL7w)w0Yt^(eK;;Ha|AyOOq;R%WJ{MZ+uTjVdLr#AKRgr)6wk>zii}
zKD@NYT;@jR*@K@lHf`32s$Qky*Q2p<R={jAMDow5LM56EE7qLwyiv*gWYj35`L0+=
zN|P8FgpeZcv{4$DK^a)LQ?@NdDyn-etXCrqz1+$>8mZX4+xlcVp_j!4Z=(!eMUbt-
zA(+&+)v!<~P*VH5QtI+HTFuDinx~%MH$snMJ08+1_P!Kz)@V3)0&~1*H13$m=NC&Qv9FWZV2mzKv^k`~&)uGnvkv%AF5o6vf7Ngi@RKet~b$VP}1r2s_+iCP*|IjhfYo
z8F@w{a+cy@uiE-3K0x8WsF657!
zX5QVX(u#JZ$x~352x7WhWrka^exznpla{vquHNQ`gWT<$^D!oI(%WPd1AB`-MHvET
zNkX3|64y9`TbmI4nJ`=5{z%o?TjH6!(Hl{9D-1J2aKQx;iVC{=m0j+&EBOw-dbF3k6U{jQup^pKKsfBbFRdpi)
z@8FqP$s~+ZxsfpawN78rBQuLJ4eb=A(Ei!HKe@A3N$R1uMV`8T_*=|Wzyo9SZqwQF
z#MXOT@Ln@-D;5>YLC+rawxRTz)Y;3OOrlZGuz8dgSmIqERSeO+BrUgurdGSBvkosjzc1b51qrcsP+
zGOcp$-Ms?~(`D*99Txqf8T#sjU0q9i+MCdN^mFH4YV$Z|=bg*%IGOwN&AqE@`>2sO
z@-w5H9eEMH@htlMi3aXiG#1mUR>saiV)yX4@mU+8ZH_Kxhe3_u!cL*PkFJ;Il}5Gq
zTf@-X)OFj0RypMUF+0s)HIvLN8=VKOI*1!VLCC6Lz-E)72wX
z9NP6pIfL{DGm$oJAm*gh;5d}L$w3J(h3p%kQK#c#3Sg&V{b?z~#vJT-1Y
zF*KKn9V}+7^2o+Jv04AUFt;i+8$%`0u+v@|jaB8SEHmn6GqR*MS*tC5rWWcrw!OMc
z+07g1crqPQVRQxyV2WCf7%3U2XYvu3%HSVgOY)jvmkV9qc0Z_ECu)1ssAGE>h>Tq3
zd~Uxs&wT`sgIUMRG~#QyAx5x>y+bN~j|41loEF2A?(WrCT@S~YIMK*B*m-?lt>^A^
zUSc+_&tS+T%O^S{5iY|bR-}eTA=`VbEpJQCZBzS7G8V=89Gwd+fTrk_xl9#|hZ1E4
zZ@YD1Xv^8-gMEUDv;7B?$7f~^gR%0q6W5V&7~#rEn4$%P+$&WYOr!(pO339@P>IU^
zUQN0cSCGbZ2$<~MJ7!umhKyq~A+=UDo2lVe?ZDIXS1hO5&D3GEQ6cW70XX$`L?zlL
z%!vUGM`;**Wp77f2OEA-)g5GbOV-b!?VQc*HV;)P-bHA7-#Loi-p-&t$&{JtAugY1
zdNGgtTQfR$uXTfgBgP%DuM!#=Ls2xB!@ulN*u+Ly>~j~mqj?f0=5;Q=~KHSE$W)`#{fXFUqjZr!r&)hQQlw+2M_GMXA@=8N29nA+Hm
zUhsBls@DtM`-lt&w|g8KtAUn#rlLkthqMt?ccp(`ivB
z>xSFZ$hzaM^9yI+4w^+bPjZWMR7#x>+7gS%H>i-A{l!Ebyx~n-+%GO-;OUE+WIPpm
z!*={Ajfc26#?ZJnGZsUkfM6`pTy$7^su9FCI&$M}?oJz%*dCUhBaUri*S-n*u3ff|
z?D6jD7uYoYh9A4m^c&kRWUuq9dw
zY&JDFY`4Q-+s=h)kFw7QNU1bj%@)J-^mJh~9W|mL%A!#!9viT~h3P;rR;%=1QCMCW
zILr>o#m1-XU2PTInq9NeO6`!u=Y46*(U)6njC-N&))hcP&Ea>P(256HntYniq3j+O}us
zj;nanq|+?8Nm|a&F_LymA@fe&uH={m$s-G9G(gKe!#^Bp6cuhNawQ+p&I?V*eJKvZ
zo|YS@-&1do^xBCCk*d`kX4Ewtwlb!@0w2$8k>fXnJT@+TOeTE)zF2
z-M&>yYNdCYb0CwLiel{nYi6ziWis4E&w2-@XX&nnd@~(W4K){Fc9pMfI5+9#r()fT
zJegNq7(3z6d>LJC^D9kBnYKHp8@%Ly@STE=){#1xf+S-G!EN
zlQV-2^Ft$o5~G0e;8fcV_hK@f(Zq4Cw~Ywq`?9G6`s${uGyvM_hGd)q76<6kMo>-J
z7|WZFz;=$l%xS#QEBB&m;L4B763oyL(kGK9-9(>Mw5r5#D-CG|3rtkQgi%ZggJlUS
ze~c2wF7j%k@R~*85b1RcteXwz^D?UB=3RrlK+*D2Dm=!3&OAqJbh2SQG#cJA$eC8D
zI>zhJG=B3nO_A|;~CR2LD|-DJXyAoRm9ATZ>jAGzD%
zn#+dl&EAtBo}s;vs>ERvHNj?;u@T35GTUc1`f39j@|%~;G2NiFcM|AjMU^>JJ!0N4
zrig)GijAqlgTdn{`O=)3yN;pR>HqpPO4iTooO-_0!FN^d>{-(w#
z%v6*{>h-jql0a&C^j6~OFhLr|+H93RQDDIN6R5EX4pwJnV5D3QM+2=`x=DiK)K+`c
zmQ}U1W=7r~Qe@TLe4@=nMryK80TRf^MrLMs<5l9Yt@sn;sj6$-AoKOkwy^)zbT
z?d>xT1uYz>Oms}AG>d{fV0IucSgCaG4Kf0-FCem}QZ4OC(rO-KlQ%Fzj4aG{1~tvJ
zyc@&f)*bq})B4Fh`-WE!>`Us!DDCaIZEhjha#%7Cq{ZHiNiv=!-9DZPYsE}GyS*E=
zxu!LNxhW)yfo`_VZQIt>Zo;tBin8Sxqt^LrsCDTQ)zCno$Z|LTv^p*aFO%>Q5#i(}FKm7?joY
zX*(C89l_PG@g(?2TvGwMg$^EbJx;J2$|9HoHw8
z#tE}g{HM|6&H^@N$-1sZzCY(9btbEa^T^yf`E4a&G_Z4s`4qu^JhvEV4Lj*DyhG
zWA57H3s%QfkR)ahQ4_Z;YOYwO!Sv3&mlowgn7qc+NeLfl3~lAb;BnMoVJkIT{AC8W
zcuXx&B&9+eW&@N;VYGChO4PfIpX;fmfXBO0H^tDU&7b`(LNn6=8Xa7{RT;G|X
zoJy);1=B-DKj|XA+9DmLp07$i^AQ9df-|M2J&l&QDWz6y8*xQDrFdooKdqoJu4|Sn
z&RmJiJ<&XVdbWA;*_NzA%Z8hQz+~9|yk-15-#$7eYsO3hHiSj20*@E#gNDe_=-A44
z6BVv%0HHsrZZ|z{*5^$iQdwJfHA}3CFrT8x>hlVXnXNfWvpKENzD&Yq
z`qb1%A!vqt(+Eu;rTq&t!)SLRC>o00+83bpG}pQF=%STEGa{mO9ob;)dutzraiDW|
zO1{`qJTNlWdS4#Xva=h8PgA@O&)n3v-Z8l~0|2+o3Wm>8wT%!E_+wX4bN#HsA_v*j
zT~MLZ-#`8ruC%Q=Obs_!u8B#nqj;@%@;bO&U+OKNv^0%ESjNUiF%jUV^>migdY`HB
zjeN5U%X&2|uN-^5&=fLnAyZMiPS7bF4|CjzrD{YOTQLF8)g4jNR5OyFD({tp8Bco_
z{fG&c$Ii>Tr-4E1iHxTWJh>`k?YPI-5Y|0byZPCO6JDM&o~k@h4Z01gY3Ka)3X%zZW?#DdU33+@Wa-^_ir!v<4#p6Q;=BDj)3K=Be|=*t?cb9O<|A{IrtHoxn2cNVsDZBGU3>b?UNMsF-$X=y&|kTH
z#TEU_SNE@6<*&GMaK-BW}#Xdb@@zje1b&-=Z1PpdZ)FWxDptYw>aPWNlBpbj9-JYuB#u
z*Za$TUa^-exm?k@yuyFq`|?Lu@@OTGuITOBxqav6R$HtnEbrQgx-gmR*A!`xeL{CK
zFjttkU#pdqI+kW_BOC2s-Fi<#V%@ucb8IIxgZ}Dblyz+lW35YuG~le|^AK5Px~$
zn!>8C){zkOX5l1?Sv$$M-MtY`qR@-65B{?UAMBW@zV=5^_N8Hws0l#@w%ZotXtHhb
z_9ZOSJS`ZLGHdkgQp>`r6nD60;Z({`<5bF~q#R86Q%1`Zb7X}8WOLV`y+Q1(&388U
zjI&_W)?EI-IhistNgtbFc{%hC1e2AC#uN8Pm8js4OeGV3J$T~&27xDp8+58BAJV
z9}j@gOu^e1Cv57Fzmyz^_3%Kz2szeaagKb2Fl~{Iw-bRq$nt8Aq->wmVJ96-`N^M2
z8LJ1Q(M0gZI-0`CjLAxb?k${7SvZ}-(gQPGrpN5#Y|Z-2xf#14!ivH1PN(cmvnj$-
ztOpokx~w6~jn!XRW|Q+k0u`kI~)jag{gx>69b?f=~go+NJ=4S9dIBuNJ&rG~1q0
zF+v6GDwb(kV{n^JPzf|a~1oYF`$nGZAJ>-3xoGiSC=PX@2)S(PD;sa5>!G;0t}8E2R+
z*BfI|6=6JXi4y@Y|l%fgV$2ZYvZF_Yv
zJM`cuUrGb=TF?nQXxqP8F6N&EeJpmv~_+3t1uBvVHwQA604Nhl3EfcQzWBl
z1Ewcq5$u&7W>Lu*Dmd(^*+`YNUeRF|Y~56ylg4g>XwszCEZi_{WHgF{8q+dme8@UAYJKf@5#<5^2xE5A$m$Xb}wmh)p%T@{(y_sVA#L5T)$F!FdBH{K%GR3%0
z9nEXuOP+Aq!Ks!k>i82iZ`?yJ`EXBD2f(ANwhoT}+zUP@1usG8gWo6Ly<;n_Ur&N
zjPaA4xV2@(?X7Uz_ZQB^yl^sx?JEl>V}2SZW9;Chd0R?U(2Om$dccT<
z7BUajUiSa5&c-ONNi0*_T70|W$K;LKoLg;YG{%0JKf5@}(mN4169LVqokl1&D(`mD
zALnR|P7fUGEXwQUw2XH0<4#O4W|j$AHjHC|XgX(SzBwrqj=R~KOnYlIuoK-Zdi@@i
z;kd45m$c^r#So@~BZu=TI47g2Hh=G;kugP=SH)kwBid3X+<;odtjehwS)hJRkHxet
z&gLx?9jGOQZ!67!uv;>4#eJO}iW#!Y4|{%Er(#;&IgxMu`Zyg!^k_0T@|B2gln1yt
zs?^%&(;ij*DV>xVG0OppFfz09-rX1vC%S$9JO$hL_!E{3hh<*zsT;GdcdSD%W|Ek7G
zCYWr`c`uxi;S`KJyzz!PBeN%8g*34fA}wf_{;nS32&)ln6e6&KS!xAo*%zdtGGSK$
zr({@rv}&k2FC3AXb!=xohgBrC)-H3mp?cwn3`el+UtZB!Nn_|<=SO5%&|&{yzA?}(
zM7hqfa6%^k3v;jC37LHutvqt9sf=+w6?kRNVpdPtWWgTKQ2S7u%ceGhWrK&>=_C87
kU7*&h)`{%qA}N1Kg1=wwPU5^4M`i4WN^L`Zy`Po&zx6f=+W-In
delta 4958
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
AJ^%m!
diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po
index 35635acf..16721c1c 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: 2013-05-27 13:54-0500\n"
-"PO-Revision-Date: 2013-05-27 18:54+0000\n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/mediagoblin/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -19,250 +19,280 @@ msgstr ""
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "Uporabniško ime"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "Geslo"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "E-poštni naslov"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Oprostite, prijava za ta izvod ni omogoÄena."
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr ""
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr ""
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr ""
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr ""
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "Oprostite, prijava za ta izvod ni omogoÄena."
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "Oprostite, uporabnik s tem imenom že obstaja."
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr ""
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "Vaš e-poštni naslov je bil potrjen. Sedaj se lahko prijavite, uredite svoj profil in pošljete slike."
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "Potrditveni kljuÄ ali uporabniÅ¡ka identifikacija je napaÄna"
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr ""
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr ""
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "Ponovno pošiljanje potrditvene e-pošte."
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr ""
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "Naslov"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr ""
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr ""
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "Oznake"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr "Oznaka"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr "Oznaka ne sme biti prazna"
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr ""
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr ""
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr "Biografija"
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "Spletna stran"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr ""
-#: mediagoblin/edit/forms.py:63
-msgid "License preference"
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
msgstr ""
#: mediagoblin/edit/forms.py:69
-msgid "This will be your default license on upload forms."
+msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
+#: mediagoblin/edit/forms.py:75
+msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr ""
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr ""
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr ""
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "Geslo"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr "Vnos s to oznako za tega uporabnika že obstaja."
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
msgid "You are editing another user's media. Proceed with caution."
msgstr "Urejate vsebino drugega uporabnika. Nadaljujte pazljivo."
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr ""
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr ""
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Urejate uporabniški profil. Nadaljujte pazljivo."
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr ""
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr ""
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr ""
@@ -297,19 +327,62 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr ""
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr ""
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr ""
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "Uporabniško ime"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "E-poštni naslov"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr ""
@@ -373,7 +446,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr ""
@@ -386,59 +459,209 @@ msgid "Your OAuth clients"
msgstr ""
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr ""
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "Prijava"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr "Prijava ni uspela."
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr "Za vrsto vsebine je bila podana napaÄna datoteka."
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr "Datoteka"
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr "Podati morate datoteko."
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr "Juhej! Poslano."
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr "Prijava"
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -446,16 +669,16 @@ msgstr ""
msgid "Media processing panel"
msgstr "Podokno obdelovanja vsebine"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Dodaj vsebino"
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
@@ -502,6 +725,59 @@ msgstr ""
msgid "No processed entries, yet!"
msgstr ""
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -534,19 +810,15 @@ msgid ""
"a happy goblin!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "Prijava ni uspela."
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "Å e nimate raÄuna?"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "Ustvarite si ga."
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr ""
@@ -555,7 +827,7 @@ msgstr ""
msgid "Create an account!"
msgstr "Ustvarite raÄun."
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr "Ustvari"
@@ -589,7 +861,7 @@ msgstr ""
msgid "Explore"
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr ""
@@ -599,22 +871,27 @@ msgid ""
"extraordinarily great piece of media hosting software."
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
+msgid ""
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
+"\n"
+" Set up MediaGoblin on your own server"
msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
@@ -629,13 +906,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr ""
@@ -652,22 +929,29 @@ msgstr "PrekliÄi"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "Shrani spremembe"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
+msgid "Changing %(username)s's email"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -695,12 +979,12 @@ msgstr "Urejanje %(media_title)s"
msgid "Changing %(username)s's account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
+msgid "Delete my account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
-msgid "Delete my account"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
@@ -714,6 +998,36 @@ msgstr ""
msgid "Editing %(username)s's profile"
msgstr "Urejanje profila â %(username)s"
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -724,8 +1038,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr ""
@@ -749,7 +1062,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr ""
@@ -758,6 +1071,10 @@ msgstr ""
msgid "WebM file (Vorbis codec)"
msgstr ""
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -769,47 +1086,39 @@ msgstr ""
msgid "Image for %(media_title)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr ""
@@ -828,7 +1137,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
@@ -855,11 +1164,6 @@ msgstr ""
msgid "Edit"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -914,29 +1218,22 @@ msgstr "Vsebina uporabnika %(username)s"
msgid "â Browsing media by %(username)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1095,26 +1392,34 @@ msgstr ""
msgid "Could not read the image file."
msgstr ""
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr "Opa!"
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr ""
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr ""
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1151,9 +1456,8 @@ msgstr ""
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
+"You can use Markdown for formatting."
msgstr ""
#: mediagoblin/user_pages/forms.py:31
@@ -1176,77 +1480,80 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr ""
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr ""
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr ""
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr ""
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr ""
diff --git a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo
index 0f113dcbf07623406959c7f6b2235080cbf36ba5..4deac0e6102124f4b1d0c96fbd41d9cd50ac33bb 100644
GIT binary patch
delta 10485
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
delta 5079
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
IOPfFc7w)Guy8r+H
diff --git a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po
index aabf18db..757859d6 100644
--- a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sq/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: 2013-05-27 13:54-0500\n"
-"PO-Revision-Date: 2013-05-27 18:54+0000\n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 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"
@@ -20,250 +20,280 @@ msgstr ""
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "Emër përdoruesi"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "Fjalëkalim"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "Adresë email"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Na njdeni, regjistrimi në këtë instancë të shërbimit është i çaktivizuar."
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr "Emër përdoruesi ose email"
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr "Emër përdoruesi ose adresë email e pavlefshme."
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr "Kjo fushë nuk është për adresa email."
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr "Kjo fushë lyp një adresë email."
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "Na njdeni, regjistrimi në këtë instancë të shërbimit është i çaktivizuar."
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "Na ndjeni, ka tashmë një përdorues me këtë emër."
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr "Na ndjeni, ka tashmë një përdorues me këtë adresë email."
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "Adresa juaj email u verifikua. Tani mund të bëni hyrjen, të përpunoni profilin tuaj, dhe të parashtroni figura!"
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "Kyçi i verifikimit ose id-ja e përdoruesit është e pasaktë"
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr "Duhet të jeni i futur, që ta dimë kujt t'ia çojmë email-in!"
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr "Thuajse e keni verifikuar adresën tuaj email!"
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "Ridërgoni email-in tuaj të verifikimit."
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr "Nëse ajo adresë email (siç është shkruajtur!) është e regjistruar, është dërguar një email me udhëzime se si të ndryshoni fjalëkalimin tuaj."
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr "S'u gjet dot dikush me atë emër përdoruesi."
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "Ãshtë dërguar një email me udhëzime se si të ndryshoni fjalëkalimin tuaj."
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr "Email-i i ricaktimit të fjalëkalimit nuk u dërgua dot, ngaqë emri juaj i përdoruesit nuk është aktivizuar ose adresa email e llogarisë suaj nuk është verifikuar."
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
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:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "Titull"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
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:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr "Mund të përdorni\n \n Markdown për formatim."
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "Etiketa"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr "Ndajini etiketat me presje."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr "Identifikues"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr "Identifikuesi s'mund të jetë i zbrazët"
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr "Titulli i adresës së kësaj medie. Zakonisht nuk keni nevojë ta ndryshoni këtë."
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr "Leje"
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr "Jetëshkrim"
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "Site Web"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr "Kjo adresë përmban gabime"
-#: mediagoblin/edit/forms.py:63
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr "Dërgomë email kur të tjerët komentojnë te media ime"
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:69
msgid "License preference"
msgstr "Parapëlqime licence"
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:75
msgid "This will be your default license on upload forms."
msgstr "Kjo do të jetë licenca juaj parazgjedhje për forma ngarkimesh."
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
-msgstr "Dërgomë email kur të tjerët komentojnë te media ime"
-
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr "Titulli s'mund të jetë i zbrazët"
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "Përshkrim i këtij koleksioni"
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr "Pjesa titull e adresës së këtij koleksioni. Zakonisht nuk keni pse e ndryshoni këtë."
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr "Fjalëkalimi i vjetër"
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr "Jepni fjalëkalimin tuaj të vjetër që të provohet se këtë llogari e zotëroni ju."
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr "Fjalëkalimi i ri"
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "Fjalëkalim"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr "Ka tashmë një zë me atë identifikues për këtë përdorues."
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
msgid "You are editing another user's media. Proceed with caution."
msgstr "Po përpunoni media të një tjetër përdoruesi. Hapni sytë."
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr "Shtuat bashkangjitjen %s!"
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr "Mund të përpunoni vetëm profilin tuaj."
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Po përpunoni profilin e një përdoruesi. Hapni sytë."
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr "Ndryshimet e profilit u ruajtën"
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr "Rregullimet e llogarisë u ruajtën"
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr "Lypset të ripohoni fshirjen e llogarisë suaj."
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Keni tashmë një koleksion të quajtur \"%s\"!"
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr "Ka tashmë një koleksion me atë identifikues për këtë përdorues."
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr "Po përpunoni koleksionin e një tjetër përdoruesi. Hapni sytë."
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr "Fjalëkalim i gabuar"
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr ""
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr "Nuk krijohet dot lidhje për te tema... nuk ka temë të caktuar\n"
@@ -298,19 +328,62 @@ msgid ""
"domain."
msgstr "Pa cookie CSRF të pranishme. Ka shumë të ngjarë që të jetë punë e një bllokuesi cookie-sh ose të tillë.
Sigurohuni që të lejoni depozitim cookie-sh për këtë përkatësi."
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr "Na ndjeni, nuk e mbullojmë këtë lloj kartele :("
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr ""
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr "Ndërkodimi i videos dështoi"
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr "komentoi te postimi juaj"
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "Emër përdoruesi"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "Adresë email"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr "Vend"
@@ -374,7 +447,7 @@ msgstr "URI ridrejtimi për zbatimin, kjo fushë\n është e
msgid "This field is required for public clients"
msgstr "Kjo fushë është e domosdoshme për klientë publikë"
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr "Klienti {0} u regjistrua!"
@@ -387,59 +460,209 @@ msgid "Your OAuth clients"
msgstr "Klientët tuaj OAuth"
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr "Shtoni"
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr "Fshije"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "Hyni"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr "Hyrja dështoi!"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr "Kartelë e gabuar e dhënë për llojin e medias."
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr "Kartelë"
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr "Duhet të jepni një kartelë."
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr "Yhaaaaaa! U parashtrua!"
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr "U shtua koleksioni \"%s\"!"
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr "Verifikoni email-in tuaj!"
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr "dilni"
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr "Hyni"
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr "Llogaria e %(user_name)s"
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr "Ndryshoni rregullime llogarie"
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -447,16 +670,16 @@ msgstr "Ndryshoni rregullime llogarie"
msgid "Media processing panel"
msgstr "Paneli i përpunimit të medias"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr "Dilni"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Shtoni media"
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "Krijoni koleksion të ri"
@@ -503,6 +726,59 @@ msgstr "10 ngarkimet e fundit të suksesshme"
msgid "No processed entries, yet!"
msgstr "Ende pa zëra të përpunuar!"
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -535,19 +811,15 @@ msgid ""
"a happy goblin!"
msgstr "Njatjeta %(username)s,\n\nqë të ndryshoni fjalëkalimin tuaj për GNU MediaGoblin, hapeni URL-në vijuese në \nshfletuesin tuaj web:\n\n%(verification_url)s\n\nNëse mendoni se këtu ka gabim, thjesht shpërfilleni këtë email dhe vazhdoni të jeni\nnjë djallush i lumtur!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "Hyrja dështoi!"
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "Nuk keni ende një llogari?"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "Krijoni një këtu!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr "Harruat fjalëkalimin tuaj?"
@@ -556,7 +828,7 @@ msgstr "Harruat fjalëkalimin tuaj?"
msgid "Create an account!"
msgstr "Krijoni një llogari!"
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr "Krijoje"
@@ -590,7 +862,7 @@ msgstr "Hedhur në qarkullim sipas MediaGoblin, një program jashtëzakonisht i shkëlqyer për strehim mediash."
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
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/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr "Nuk keni ende një të tillë? Ãshtë e lehtë!"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
+msgid ""
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
+"\n"
+" Set up MediaGoblin on your own server"
msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
@@ -630,13 +907,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr "Po përpunohen bashkangjitjet për %(media_title)s"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr "Bashkangjitje"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr "Shtoni bashkangjitje"
@@ -653,22 +930,29 @@ msgstr "Anuloje"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "Ruaji ndryshimet"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
+msgid "Changing %(username)s's email"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -696,14 +980,14 @@ msgstr "Po përpunohet %(media_title)s"
msgid "Changing %(username)s's account settings"
msgstr "Po ndryshohen rregullimet e llogarisë %(username)s"
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
msgid "Delete my account"
msgstr "Fshije llogarinë time"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
@@ -715,6 +999,36 @@ msgstr "Po përpunohet %(collection_title)s"
msgid "Editing %(username)s's profile"
msgstr "Po përpunohet profili i %(username)s"
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -725,8 +1039,7 @@ 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/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr "Shkarkojeni"
@@ -750,7 +1063,7 @@ msgid ""
msgstr "Një shfletues web modern që mund të luajë \n\taudion mund ta merrni te \n\t http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr "Kartela origjinale"
@@ -759,6 +1072,10 @@ msgstr "Kartela origjinale"
msgid "WebM file (Vorbis codec)"
msgstr "Kartelë WebM (kodek Vorbis)"
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -770,47 +1087,39 @@ msgstr "Kartelë WebM (kodek Vorbis)"
msgid "Image for %(media_title)s"
msgstr "Figurë për %(media_title)s"
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr "Aktivizoni/Ãaktivizoni Rrotullimin"
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr "Perspektivë"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr "Ball"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr "Krye"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr "Anë"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr "WebGL"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr "Shkarkojeni modelin"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr "Format Kartele"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr "Lartësi Objekti"
@@ -829,8 +1138,8 @@ msgid ""
msgstr "Mund të merrni një shfletues web modern që \n është në gjendje ta shfaqë këtë video, te \n http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
-msgstr "Kartelë WebM (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
@@ -856,11 +1165,6 @@ msgstr "%(collection_title)s nga %(username)s"
msgid "Edit"
msgstr "Përpunoni"
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr "Fshije"
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -915,29 +1219,22 @@ msgstr "Media nga %(username)s"
msgid "â Browsing media by %(username)s"
msgstr "â Po shfletoni media nga %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr "Shtoni një koment"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr "Shtoje këtë koment"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1096,26 +1393,34 @@ msgstr "Etiketuar me"
msgid "Could not read the image file."
msgstr "Nuk lexoi dot kartelën e figurës."
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr "Oooh!"
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr "Ndodhi një gabim"
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr "Veprim i palejuar"
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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 "Më ndjeni or trim, nuk ju lë dot ta bëni këtë!
Provuat të kryeni një funksion që nuk lejohet. Keni provuar prapë të fshini krejt llogaritë e përdoruesve?"
-#: mediagoblin/tools/response.py:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1152,10 +1457,9 @@ msgstr "Koment"
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
-msgstr "Për formatime mund të përdorni Markdown."
+"You can use Markdown for formatting."
+msgstr ""
#: mediagoblin/user_pages/forms.py:31
msgid "I am sure I want to delete this"
@@ -1177,77 +1481,80 @@ msgstr "-- Përzgjidhni --"
msgid "Include a note"
msgstr "Përfshini një shënim"
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
-msgstr "komentoi te postimi juaj"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
+msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr ""
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr "Hmmm, komenti juaj qe i zbrazët."
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr "Komenti juaj u postua!"
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr "Ju lutemi, kontrolloni zërat tuaj dhe riprovoni."
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr "Duhet të përzgjidhni ose shtoni një koleksion"
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "\"%s\" gjendet tashmë te koleksioni \"%s\""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "\"%s\" u shtua te koleksioni \"%s\""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr "E fshitë median."
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "Media nuk u fshi ngaqë nuk i vutë shenjë pohimit se jeni i sigurt."
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
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. Hapni sytë."
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr "E fshitë objektin prej koleksionit."
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr "Objekti nuk u fshi ngaqë, nuk pohuat se jeni të sigurt për këtë."
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
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:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "E fshitë koleksionin \"%s\""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr "Koleksioni nuk u fshi ngaqë, nuk pohuat se jeni të sigurt për këtë."
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
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 5564d35d99671d3578fa01e2bb3125cc1bc7f7c4..2dd2d4617f2f48b0bacaaef4c0dbb6818da8602c 100644
GIT binary patch
literal 30510
zcmeI4d2}6Dea8oq;8@uR*~ot7M6raeC)o*(qgZwl?_k-kl+mji^*e!lnKd5bI?2M+(e
z97i9`%$>XZe!u&>zx$gRefKHHzaiki4NnMy3*ebOI%@rQ@|i&}%i$^TO85uxT=*$?
zA^Zls82&dLhG(8dU2roz8@?Ex2k(Xy2|nu2KLAhU_#sHs!6Wcw_(QlFJ_?@>3sf=$
zOYkQ6dUzK%{0Lsf@!V5gJAV$3_Q@Pr@~vzaOrEKZV=ir40HRumUxXk3rS{Ls)?S2i0zY
z&YlFJ#@0pA2Kf?tNW!$+XxHN{Ew=MSO!
z`6h@;gZD$p;eM$4{{gDpw;=z5@9{&|WmKnw)1mIa1Rf99K*`~1sPbDOstqO~q7PmG
z5p8hLU%wB^&b|hv@9#j>^B+*-{xQ^e9)pM?xY#(kt%It6FI)~YDE+?$N>BGd$@5;Q
zcK;Dx0)GN!4`);9YB&Zp&O4#neF;?mUkN3TgHZL}>(74}ZsquXxDqZ!nRmc7@IiPV
zoPe*Ou@&$~@R#uXOPxN>LrDxJ*ag?Z6h0rm2hPLgm%0Al15s7*Nho{&CX{@B05y(Z
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
Go$~*n%B*Ps
delta 4948
zcmeIz`%{$H9mnyrsGxX5KtvH))~KKeUI0Z!R3M@vngoqnZ-DE%imZh-NE2PPC2BIM
z)+ZNH8>L>F#MYYGjPa7jRHLn#PE4!TI`L8)jgyJBsnOP&X!`!}JTv_h`b!z$blz1WONr}To{KPuq$3QCS*J`hHxPw)|ed3!7N;Yvv3=((w9{p8}
zt_creD?EeDVa{SlypH^uJN)Z}QC*E`hY6_r+!%+0u@m!~VjAgOD91Lq%DLf3PJavL
za{YBI!Sgr~dl5wr`cVV#KuvT2+v5>bfTxhy%}3aTmoXCSyBXtQezS@OzowagjBO5M
z8lFKn-bbaZdm?GXzQ`D6Fh*esX5&=sg^lKgTN_Tt038+A(qUNc>kRorOp@CjN
zMYb8KifKYUun$|~`>2(jKuvT8nZw*h)jo=Uy6!>Md@QO26H(94L@i`4YOgKnLH=2s
zS6>tDGa6Kxp=TIwKk1FNs&h_0mp8f&M!27ro
z`}8FL7ijDvoJxF_tv+pi&x5R4G`1!*L$2!Y$Z<-S|*}{RDMN_MtY{Y1GOuV{g2L
z9*l9@nHq{(Kv{@}Qal}%GC!&WwWu2!P@k_s4g4~y_HQ6#nq#OEUPYDcD^x}zQtebn
zp(c(;jWZ1O{6r+FCR9N~HGB@0@>ft1??Tn;x2Rox4wcd?sFhwvr8q8_#K
z*HHIwM`h$q)c8l8>*r8`U&Gcq|No+)0lsayz|QPr%+vH!aSt}2B2VdSpZ5~fCR&9p
zHAkiLG!Dk=I13Z{am4WZs0^IP)_4tBgZUgMF~5ms^kSTjkK=aK@%RjDP={EjB!F7U
zI(!OuVj12=1ytCd?+{#unHbAXcH>yoc$LVlCgk`ghFF|AOQRhBjjOSY(exF32Iu2<
zI0WYpwD*98bLlssYJMMEVI;F^h0)j+JEKaF=-3~%2}hw8G9{DzyJ;-qf+pO6ZSXKE
z;$zN@moSR{J=6dXu@lDdkV=q(x<4OTyqSg5un|k}Q!K>C25|y#5stx~gUJ6#8rQh+
z941r1M%;=d!?;6fQRv_&i^SIWYg>=PXuc&BIPojsmm-ZK)wIBBDWe3(Iwz)R3_>$2J2CqaXl)4
zS5bRpA8KJoQ1^X^ad^JvbL#&E4b|>GDrKJ0_6=#M{wO2~W*llWHQ+=%jtaOVY0$uh
zsENw4Je7168_l&h-);Prn@bE;HM4C7v!K{}*VCFSg(RDUaLdaxE&Q
z`!NMSLpHo=#VD(A6gJ>dRA4zJ_9>Zy+FVOfD_?`XaT9v*9aN?+U=-d7(NKyXU|Z}s
z!7f1p>V{<0=Y3EE4@cF$6ctz%YV-XNRkD|{HSR^FdLL@yL#S~+MLmBT6-cNJTUj-9
zqf(xSig-L~fF;-tSD;e57L##3D%E>Yfxm}({-o1C>v#!Onj4sg|G?+5$E23$L#COA
z0(ckMALbKOs^d!Sm6f6bnS&c~F-GD8RO(%m?Mx)0Rz4DS{}@z8CZoom=UiWb3cL|p
z-v8TZD3v=~E*SFxK2855?!n|TJMt5lL;n_Lpl6Cxb5tsq;$U2lv+xL3Vb`g41{zQS
zHli~80=B&W_tRkinFq)|Gh?2xkHVz!_Hx{1vg&xe_K
z5Z!nK^>&Obx4#d1J5I)y_kTSNe$7w$w;JzY7S>HOWAOg5w~M2
zd<(V0{ir<=#xD4t%KEwXX4q+kv-{COqFw=hj7tQ4S>;2!z1-<`&gN-VpAm
zMtp`9F(Emem~bS*x}7-G%If}m>tyLgD=Vq1^=i_0*3lW!R&&p>o0G?dws=-DdpQD!byEcFT7
z>x;^z*7ZRLW6CRhKJNl|y+63f(5?%w81iG6_4&ecR&Gv)H6*uN_~$vxTDAB2s=e+f
z1Hp=**NV>@Wi{q)h|J9%v}~k1+-bxU5#c|My63VM7p!!Rw%oO;;a`pE=(2LgjkP`*
zH`>ZBTw@*RonWngX1}$ms5Uxh;E-YN!9z#nWLq7IdpX_Vbi>)j^{()r;?w?LssDMU
F{sYM1@=E{!
diff --git a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po
index fcf8a666..accbc5cf 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: 2013-05-27 13:54-0500\n"
-"PO-Revision-Date: 2013-05-27 18:54+0000\n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 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"
@@ -18,250 +18,280 @@ msgstr ""
"Language: sr\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr ""
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr ""
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
msgstr ""
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr ""
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr ""
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr ""
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr ""
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr ""
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr ""
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr ""
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr ""
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr ""
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr ""
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr ""
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr ""
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr ""
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr ""
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr ""
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr ""
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr ""
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr ""
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr ""
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr ""
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr ""
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr ""
-#: mediagoblin/edit/forms.py:63
-msgid "License preference"
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
msgstr ""
#: mediagoblin/edit/forms.py:69
-msgid "This will be your default license on upload forms."
+msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
+#: mediagoblin/edit/forms.py:75
+msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr ""
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr ""
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr ""
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
msgid "You are editing another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr ""
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr ""
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
msgid "You are editing a user's profile. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr ""
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr ""
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr ""
@@ -296,19 +326,62 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr ""
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr ""
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr ""
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr ""
@@ -372,7 +445,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr ""
@@ -385,59 +458,209 @@ msgid "Your OAuth clients"
msgstr ""
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr ""
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr ""
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr ""
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr ""
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr ""
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -445,16 +668,16 @@ msgstr ""
msgid "Media processing panel"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
@@ -501,6 +724,59 @@ msgstr ""
msgid "No processed entries, yet!"
msgstr ""
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -533,19 +809,15 @@ msgid ""
"a happy goblin!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr ""
@@ -554,7 +826,7 @@ msgstr ""
msgid "Create an account!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr ""
@@ -588,7 +860,7 @@ msgstr ""
msgid "Explore"
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr ""
@@ -598,22 +870,27 @@ msgid ""
"extraordinarily great piece of media hosting software."
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
+"\n"
+" >Create an account at this site
\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
+msgid ""
+"\n"
+" Set up MediaGoblin on your own server"
msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
@@ -628,13 +905,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr ""
@@ -651,22 +928,29 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
+msgid "Changing %(username)s's email"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -694,12 +978,12 @@ msgstr ""
msgid "Changing %(username)s's account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
+msgid "Delete my account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
-msgid "Delete my account"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
@@ -713,6 +997,36 @@ msgstr ""
msgid "Editing %(username)s's profile"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -723,8 +1037,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr ""
@@ -748,7 +1061,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr ""
@@ -757,6 +1070,10 @@ msgstr ""
msgid "WebM file (Vorbis codec)"
msgstr ""
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -768,47 +1085,39 @@ msgstr ""
msgid "Image for %(media_title)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr ""
@@ -827,7 +1136,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
@@ -854,11 +1163,6 @@ msgstr ""
msgid "Edit"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -913,29 +1217,22 @@ msgstr ""
msgid "â Browsing media by %(username)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1094,26 +1391,34 @@ msgstr ""
msgid "Could not read the image file."
msgstr ""
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr ""
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr ""
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr ""
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1150,9 +1455,8 @@ msgstr ""
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
+"You can use Markdown for formatting."
msgstr ""
#: mediagoblin/user_pages/forms.py:31
@@ -1175,77 +1479,80 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr ""
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr ""
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr ""
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr ""
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr ""
diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo
index 3b961e60ab413b86b73d000536f403ffde032265..ff4255308ac708e6abdb2a87cec12adf889549a5 100644
GIT binary patch
literal 30740
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
delta 4975
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\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/mediagoblin/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -20,250 +20,280 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "Användarnamn"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "Lösenord"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "E-postadress"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Vi beklagar, registreringen är avtängd på den här instansen."
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr ""
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr ""
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr ""
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr ""
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "Vi beklagar, registreringen är avtängd på den här instansen."
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "En användare med det användarnamnet finns redan."
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr "Det finns redan en användare med den e-postadressen."
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "Din e-postadress är verifierad. Du kan nu logga in, redigera din profil och ladda upp filer!"
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "Verifieringsnyckeln eller användar-IDt är fel."
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr "Du måste vara inloggad för att vi ska kunna skicka meddelandet till dig."
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr "Du har redan verifierat din e-postadress!"
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "Skickade ett nytt verifierings-email."
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr "Kunde inte skicka e-poståterställning av lösenord eftersom ditt användarnamn är inaktivt eller kontots e-postadress har inte verifierats."
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "Titel"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr "Beskrivning av verket"
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr ""
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "Taggar"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr "Sökvägsnamn"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr "Sökvägsnamnet kan inte vara tomt"
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr ""
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr ""
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr "Presentation"
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "Hemsida"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr ""
-#: mediagoblin/edit/forms.py:63
-msgid "License preference"
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
msgstr ""
#: mediagoblin/edit/forms.py:69
-msgid "This will be your default license on upload forms."
+msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
+#: mediagoblin/edit/forms.py:75
+msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr "Tidigare lösenord"
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr ""
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr ""
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "Lösenord"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr "Ett inlägg med det sökvägsnamnet existerar redan."
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
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:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr ""
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr ""
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
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:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr "Fel lösenord"
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr ""
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr ""
@@ -298,19 +328,62 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr ""
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr ""
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr ""
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "Användarnamn"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "E-postadress"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr ""
@@ -374,7 +447,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr ""
@@ -387,59 +460,209 @@ msgid "Your OAuth clients"
msgstr ""
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr ""
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "Logga in"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr "Inloggning misslyckades!"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr "Ogiltig fil för mediatypen."
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr "Fil"
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr "Du måste ange en fil"
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr "Tjohoo! Upladdat!"
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr "Verifiera din e-postadress"
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr "Logga in"
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -447,16 +670,16 @@ msgstr ""
msgid "Media processing panel"
msgstr "Mediabehandlingspanel"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Lägg till media"
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
@@ -503,6 +726,59 @@ msgstr ""
msgid "No processed entries, yet!"
msgstr ""
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -535,19 +811,15 @@ msgid ""
"a happy goblin!"
msgstr "Hej %(username)s,\n\nför att ändra ditt GNU MediaGoblin-lösenord, öppna följande länk i\ndin webbläsare:\n\n%(verification_url)s\n\nOm du misstänker att du fått detta epostmeddelanade av misstag, ignorera det och fortsätt vara ett glatt troll!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "Inloggning misslyckades!"
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "Har du inget konto än?"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "Skapa ett här!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr "Glömt ditt lösenord?"
@@ -556,7 +828,7 @@ msgstr "Glömt ditt lösenord?"
msgid "Create an account!"
msgstr "Skapa ett konto!"
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr "Skapa"
@@ -590,7 +862,7 @@ msgstr ""
msgid "Explore"
msgstr "Utforska"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr "Hej, välkommen till den här MediaGoblin-sidan!"
@@ -600,22 +872,27 @@ msgid ""
"extraordinarily great piece of media hosting software."
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr "Har du inte ett redan?"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
+msgid ""
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
+"\n"
+" Set up MediaGoblin on your own server"
msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
@@ -630,13 +907,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr ""
@@ -653,22 +930,29 @@ msgstr "Avbryt"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "Spara ändringar"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
+msgid "Changing %(username)s's email"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -696,12 +980,12 @@ msgstr "Redigerar %(media_title)s"
msgid "Changing %(username)s's account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
+msgid "Delete my account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
-msgid "Delete my account"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
@@ -715,6 +999,36 @@ msgstr ""
msgid "Editing %(username)s's profile"
msgstr "Redigerar %(username)ss profil"
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -725,8 +1039,7 @@ 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/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr ""
@@ -750,7 +1063,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr ""
@@ -759,6 +1072,10 @@ msgstr ""
msgid "WebM file (Vorbis codec)"
msgstr ""
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -770,47 +1087,39 @@ msgstr ""
msgid "Image for %(media_title)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr ""
@@ -829,7 +1138,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
@@ -856,11 +1165,6 @@ msgstr ""
msgid "Edit"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -915,29 +1219,22 @@ msgstr "%(username)ss media"
msgid "â Browsing media by %(username)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1096,26 +1393,34 @@ msgstr ""
msgid "Could not read the image file."
msgstr ""
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr "Ojoj!"
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr ""
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr ""
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1152,9 +1457,8 @@ msgstr ""
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
+"You can use Markdown for formatting."
msgstr ""
#: mediagoblin/user_pages/forms.py:31
@@ -1177,77 +1481,80 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr ""
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr ""
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr ""
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr ""
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "Du tänker radera en annan användares media. Var försiktig."
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr ""
diff --git a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo
index 6e7ebd216781afefac95bdc7a98f7e47a1b7e9eb..0fc405fc3f9994cda39014a61f653e034ada3840 100644
GIT binary patch
literal 30711
zcmeI43z!^Nb?1wfvC;Vb68HhCkrA4)G(D1xg*?^+y(O&IN+UZqV7aEdW~NY2SG%iw
z#sk>MCJ2Zj0kU?mu|q@x@xlhnfDHt`5N{F^0|_K-u*qiqDP~!4mRI%*$p(Vi-~ZfO
z{TPjez#;p6N&BnG1U<*tB#);=c)E`=BL=&JS485ab>B$sEx
zm%(3z7r{@%7s9W=`S9=IQh33IB2K)|O
z4u1%*gatAgge7-ByzpIk71vWQaOFG%=WzWe@Dlh1cnrcTI+x7CLbO+zFo#
zZ}xmE?Bn_{RKI-=hVYwEa-Yjhb^Sc3@_XTFa3wq&z8o%uyJ0V!gfE5fhA)DD3SSGq
z1tqUBZmK@-gsSJeAzd1L2uco*LgoJ#Q0e{(@^A1r{LynM)w$qYsP`{}r@$3Za=02Q
z{T4{q2BQ$s2XBCgHn_(>{}_~>eHp61{~9Wv{|(jd??JWaM-Wj2^Ft@MRZ#g4!$mNI
z>i_pZ_0wS}c|HhL?i27b_qL%J&X
z6qLSy6-qwehHA$@Ly8JQ8ZUWnfNIB$Q2j9qCD&c6jh{t&9%b1!%D
z?Sm?By}y1X)O!u6@^ACkZ}YqhN-usLQsv--Q2Bou9)eH%>nfeDd=J6(@V!v|{1lWN
zFF|S4o+a>C;8jrde+)`bzXT=szlD--&wxvRHeAN_rBMB_6RMn>{PSt3`W%9K?>?w}
z4*Tmz;dNYp7QP?82qUL<{2{y&ej8F`a2dw@WpFoK1K$F-!as&rz;l*5xo?E(zY(Z<
z-3n=9@F2Va{&!e}D|jfqy%(y#{xdus{xMWNzYHllcml45r!gp1&L*h-pN7}K`{5?|
zG~5gaNhCd-gcbO!a2@;)7(MCJMkx8b3hspsxD!4GCFd8=Xtj4aL?pp}co@DNsy>4l
zi4fihRn8kADiqx3`B})24Za75;XH(P5FUVtD)<(>30_L)Q{~`RD7`%bZ-kG)Iq<@(
zoE$EK(!UqMbKxS-tKdAYuYr=^2s{rSgfD=<3Pbo`pvwJIsB(S;_1>Hzm+oSC8rN4q
zy?-@43+{x<_tjACd>urUgLlJy@DHH+|Dvn0F>nOZwBQ5qI)H~1uf=&Im{Q1w{O;FKJ0gqXPCW~lV{z!$>LL-p^|
zQ2li_jaT^6{_8DgGzrlJRknHfBq@h&-Le^q|*P!I{e$P)srTa2e
zy8i*y&ZnXD>f7)hD5Ilx-wPMON8t0}S3Um@_HjLTm+QCXFywkSJOkbgd*E$Q<-Zl4
z27d#d4IhBg(@(%&_$0){*`Rq5xRSy1S~v_PuP;LB;XgsuGx(3rZ=4U$;j$kp{~@S!
z>!I@5=AVzlbGe>|djC#%3jB2_Is7J6`Uj!L;h#b2!zJ+R@K$&pM)Gm^4mbkGuXXzNdH4+1{|H|S
z|KU0}9vA)DxdXG{j?vd
zpGyAu&Hnn0Q1yF<=SQLH^%bc6pN1F1;8m_aFM-mNE1>GL9jcu-K;?fM)Hu5nsz2_6
zlFxgf+V@Eq!rzB#_us$^;oo}78L8ZP@FF+>Ro)hVeG}AsuZ1fAjsE(bQ0eZ4(uD6bT^8Y401fTKOZ@ST?e-B*G{g1(w@E@V%xOBg3&pP-kTIHKm7x%pqsvXZkS+9hb
zL+SHP@MZAra1Hz;xD}pKbn(~@_(HC4hw8ugLe=Yc;bQnLcmsSv$;Evcl-@oL_1^!2
zlH)0{tLHgT>5e)v_-Ij?c{b^u}mg1zt{
zd;ku@{sYJoUJqqweiy2Lz70`@U{2Zji4k}T*Q0O&JOI_dzwG%NPI_rbH^!%+GDAyhk`f|tV|!+r2_gu4|U
zgd5;vQ2KFZ>f*jl@M^9P!3*Gjg|CK>!`H(rt1j;Q2wcqd%9~xkmf#ky-vZwUzXaa}
zvzm+hPR(50_j(kqyfJeI?Sa5q$cO+uCbmr&(>AI^i9PB~ry=WzWBI2Z1O>epX@lKZRS
zsW67>pR#Ao^A@OlZ-aX8{hl9$%I`tA8h#Q6J)!?+RTLJ>QI@SJwqn`r<;oexX2nPm&6V`6OYpAM6W4&Zg
z{7T0gEeU2n#apf&C#+aUDV9E*O6ucbJsNA5Hnqk@ST#}$2U{Z{
zuUy`?-3>-$@%XJ;R1d8k#WoonQ@4|Dq^qWrnN{gKMth63q>3<1wEcx(UEBEa
z{U>2%<;GYT`H>mll1R!74QB!*8{YJWA&cwvq%wwOh$iDwu&!kPg;BUWu4QQ@3gd|=
zDa#1dFc5mqvzAsiZ%j-eY=2dWr;bTd33pZF%C?OzNxdEw$D40Bbye18ql#%OGnuBD
zd715Nz4O$;`xf@uWo~4iI(Wa?v>7j|dF66gOUA~L2hEY`w0r3kPbSi=9+uKd+#6mm
z>*@zBs>E^0RCNTqiV>W|z?KlBnOJl$8Y#yirb1>Ed4@6>;Z&5F(vD(-DX8Lw
zInM2oIF|87L2cMc*=r3mu9@uncsgY!cRZ?$#m+2OaU@e|%@yi;B^ys0Wjdr*OD1EP
z;3ynL_7kZ@o1HM{QW|Ed)t{ub>7P=0Xi2SxLZ!uGqb3b0a;F#MV7k=|ZJmz--|n`PWpToE(VD&YbYPQLcyS
zs41hpH&RZE2QV@SAw%3*qc|>uGPq`kY+Hs@)b?szn@Hq(xs?wza&cw1jmc8VD615L
z4KjFTLAH*7;DFwphzo@RHFdw0Q%|tLX+|#BJoo&*2|cMee@L&m`%=sq-f;E|W=Uuo
zcie1pInGl3+NUPJtFQt%-iDb+!VCTIy
zIr}$csZ>=-+N?E$HLYRy!%>Wu#^(kbAWdN^ZW#&}W}!EVDuMpi^C--wCnRxX+k8o}
zjrCqKVY!lNd!A^G)zHQz7Ntmhz*zDo(}z=e@S%c|irJ1>YSTV0hz&aIY$y}q+#P0u
zOq0>1*_;ZVXEdQ?DIWH!ZS3Y{QArB{J=!8cMDBva8AjUQRd(ZXEzXmbnDN=Tb3jV7
z`-S{*)6DxD6ZE3bWWR-WcoMSn8$YSPlS-x_V+9pqu>tdB8?2ZD{J7}#6v
zDasIeOA?1Xk+{ZjZf!ycr{ntC_D5>A?uFax>WV0v?&a}RrJP1c!2iH3lo*_wN=e=R
z$lP0Gs5`DZXBAGIS#md~T6QS+R&5VEyja`)yjv||ZZB1N67NRNnL2|q!x;vfIEXWz{eVsSTBrc4ZrUC&NV|3eK
z%QIUWY$kfG2V1bHSPn+^P_PxHx9TX+tkOBR<$Nt|?;<0U;kQeGcjxH`{_ioKAQgel>anWj;U
zY&xZS?c1{*3)5q5or*`o5p#XDp`Mp)nIL38&&RZeE);#Vc?Aq?V*a9+J`Pc2Ls
ziS06V&SKgrk8Hdbn~UEIv#Ub0GgK3~o%Y(uSCx{I%&4Eu$dbBjowh8oR%qb3{_3&1
zTMBeMor-BNI)eqUs+JNwC4PE3_qa5M`1oqF*95y%=n1xk(S!@4wl$49wwD0VSu!y}wDq)`ltZ1AbBa-gzm#?nHV@#arWCHBGz0Wps_c|{z
zTkjJeGRX>A9g+waVG+wxLsQ815$o#Pl5^YCzMPIFm3)rQ1r|V4bn0B92^OIw^+K@C
z1u*pGO#k4XVB*~P!Q}Cp&0#QB!8X=)Bpf_kDUCC3-e5;mJHV8g=^-IsV56AF
z1FadIzt_5fd1If
zs}s~Wm6_UKPY=XQ33f&kaj?^7)MmpnyXX+F-N}t}uru{jZ4|mTiR5e=YD3IqzK|U7
zG8t0_#&tdvo67?Xn2ESYNn8vaQqNivXT7@R`m0ke+-^BUpBPPz>-I)&GORUjpcjH&
zn(8$dh|)^MEh}chu94ShRc&jmIeM@ww-~L;D}eWgf)2z|C{45JT%dwa9eP)=E3Hyv
z{k1_;YX&!(lE)L(`ZTq03la_{q?YP2@yo4|Pq&ELFg2+3
zmm5WQ-1Twc%-d13>h>hJILGAF`JgScgmR-Yg}EQL>JaSSxY_^kD+Ynys7l6@aj@I@
zkK%Yth+~Gv_nBD?Ed@klk>;YirKj>BuG5hlsku94Cb4~4c9wN)Te}Wz(RcNtYbl=S
zo^gRq(=X!KH8yVCxRAYCf;DMcHJ{;FrQsLBiA2n(p=eSND(6D)&^e%d^=eN{r%Z?5
zQ!otOqVw9I^MS(YaFO$IewZ$@*1Pdv*3yn^^`MUivSt?E%givM&ezPgeyta6TG;Gr
zZn$Abyta)C>yJ{12c%YVS2M*hH8oWj%|=ZWtg^^URmKM0uQ(fw#;WCkD+)^s5?A|U}6k+mrE4v|wumoWzrD#bQ*Nd!l^z#PJt9?m~JJpD>hue%;
zt3>(KF;PZwSh42#*M+IH)V6gOvl{F@kW{O(`Obpmi=#4vjVg9zFH5GuUO%Cho6pCb
zbN}9jjbIMkOXj9fNu+dzproYIW-
zXL`zIf6QAJG35Q>)@53Wo6cJiS)Qn^YiO3$&zaqy{ylF?UDZ$i^;VlZGRWuGt&H$<
zm{&g`RvSugzC7F1(F-UyIo7v%@@9?|)@@m9bfP!E*nH%~;yu(!6(wuq-JdOn%S~!Q
z*{wV|Z=Ls>#q?35l%xy-Er>Hs(Ao=HR*cZ6uxBnhS7SodoOoKqXbE#&+B&>r`<0}$
ze3})vtQGtmCu_eIa?;tmogB-MGV0N^9JInS;={d-5iK{3aHSa0%?oYGeIWtEa4U?{
z?<^RWUV9NCQZ;&}_DM0_5?8?`pH(H)_dogVc=qMB69gy2njX5Hw%0Aa)z%Gd*tcp)
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
K=I3|J=KlfPq>cpu
delta 4984
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, 2011
+# à°µà±à°µà±à°¨à± à°µà±à°°à°ªà°¨à±à°¨à°¿ , 2011
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-05-27 13:54-0500\n"
-"PO-Revision-Date: 2013-05-27 18:54+0000\n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/mediagoblin/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -19,250 +19,280 @@ msgstr ""
"Language: te\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "వాడà±à°à°°à°¿ à°ªà±à°°à±"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "à°¸à°à°à±à°¤à°ªà°¦à°"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr ""
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr ""
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr ""
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr ""
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr ""
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr ""
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr ""
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr ""
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr ""
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr ""
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr ""
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr ""
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr ""
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr ""
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "à°¶à±à°°à±à°·à°¿à°"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr ""
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr ""
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr ""
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr ""
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr ""
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr ""
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr ""
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr ""
-#: mediagoblin/edit/forms.py:63
-msgid "License preference"
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
msgstr ""
#: mediagoblin/edit/forms.py:69
-msgid "This will be your default license on upload forms."
+msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
+#: mediagoblin/edit/forms.py:75
+msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr ""
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr ""
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr ""
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "à°¸à°à°à±à°¤à°ªà°¦à°"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
msgid "You are editing another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr ""
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr ""
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
msgid "You are editing a user's profile. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr ""
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr ""
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr ""
@@ -297,19 +327,62 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr ""
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr ""
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr ""
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "వాడà±à°à°°à°¿ à°ªà±à°°à±"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr ""
@@ -373,7 +446,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr ""
@@ -386,59 +459,209 @@ msgid "Your OAuth clients"
msgstr ""
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr ""
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr "à°ªà±à°°à°µà±à°¶à° విఫలమయà±à°¯à°¿à°à°¦à°¿!"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr ""
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr ""
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr ""
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr ""
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -446,16 +669,16 @@ msgstr ""
msgid "Media processing panel"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
@@ -502,6 +725,59 @@ msgstr ""
msgid "No processed entries, yet!"
msgstr ""
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -534,19 +810,15 @@ msgid ""
"a happy goblin!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "à°ªà±à°°à°µà±à°¶à° విఫలమయà±à°¯à°¿à°à°¦à°¿!"
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "à°®à±à°à± à°à°à°à°¾ à°à°¾à°¤à°¾ à°²à±à°¦à°¾?"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr "మౠసà°à°à±à°¤à°ªà°¦à°¾à°¨à±à°¨à°¿ మరà±à°à°¿à°ªà±à°¯à°¾à°°à°¾?"
@@ -555,7 +827,7 @@ msgstr "మౠసà°à°à±à°¤à°ªà°¦à°¾à°¨à±à°¨à°¿ మరà±à°à°¿à°ªà±à°¯à°¾
msgid "Create an account!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr ""
@@ -589,7 +861,7 @@ msgstr ""
msgid "Explore"
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr ""
@@ -599,22 +871,27 @@ msgid ""
"extraordinarily great piece of media hosting software."
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
+msgid ""
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
+"\n"
+" Set up MediaGoblin on your own server"
msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
@@ -629,13 +906,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr ""
@@ -652,22 +929,29 @@ msgstr "à°°à°¦à±à°¦à±à°à±à°¯à°¿"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "మారà±à°ªà±à°²à°¨à± à°à°¦à±à°°à°ªà°°à°à±"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
+msgid "Changing %(username)s's email"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -695,12 +979,12 @@ msgstr ""
msgid "Changing %(username)s's account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
+msgid "Delete my account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
-msgid "Delete my account"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
@@ -714,6 +998,36 @@ msgstr ""
msgid "Editing %(username)s's profile"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -724,8 +1038,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr ""
@@ -749,7 +1062,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr ""
@@ -758,6 +1071,10 @@ msgstr ""
msgid "WebM file (Vorbis codec)"
msgstr ""
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -769,47 +1086,39 @@ msgstr ""
msgid "Image for %(media_title)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr ""
@@ -828,7 +1137,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
@@ -855,11 +1164,6 @@ msgstr ""
msgid "Edit"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -914,29 +1218,22 @@ msgstr ""
msgid "â Browsing media by %(username)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1095,26 +1392,34 @@ msgstr ""
msgid "Could not read the image file."
msgstr ""
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr ""
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr ""
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr ""
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1151,9 +1456,8 @@ msgstr ""
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
+"You can use Markdown for formatting."
msgstr ""
#: mediagoblin/user_pages/forms.py:31
@@ -1176,77 +1480,80 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr ""
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr ""
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr ""
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr ""
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr ""
diff --git a/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.mo
index 4341870b74c02d3ef3bdd1b68ed008084b161e97..2faf972721be3bf595d10943f7e4c5a514b4d61c 100644
GIT binary patch
literal 30906
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
DKAsDM
delta 5024
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
QX|{X&Nmbu=z4x{M0IQ%DuK)l5
diff --git a/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.po
index 4155520f..b97d40c0 100644
--- a/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/tr_TR/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: 2013-05-27 13:54-0500\n"
-"PO-Revision-Date: 2013-06-06 15:44+0000\n"
-"Last-Translator: Caner BAÅARAN \n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 19:18+0000\n"
+"Last-Translator: cwebber \n"
"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/mediagoblin/language/tr_TR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,250 +19,280 @@ msgstr ""
"Language: tr_TR\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "Kullanıcı adı"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "Parola"
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "E-posta adresi"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Ãzgünüz, bu durumda kayıt devre dıÅıdır."
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
-msgstr "Kullanıcı adı veya E-posta"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr "Kullanıcı adı ya da e-posta"
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr ""
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr ""
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr ""
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "Ãzgünüz, bu durumda kayıt devre dıÅıdır."
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "Maalesef, bu isimde bir kullanıcı mevcut."
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr "Ãzgünüz, bu e-posta adresine sahip bir kullanıcı zaten var."
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "E-posta adresiniz doÄrulandı. Åimdi giriÅ yapabilir, profilinizi düzenleyip ve yeni görüntüleri gönderebilirsiniz!"
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "DoÄrulama anahtarı veya kullanıcı kimliÄi yanlıÅ"
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr ""
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr "Zaten e-posta adresinizi doÄruladınız!"
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "DoÄrulama e-postasını tekrar yolla."
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "Parolanızı nasıl deÄiÅtireceÄinizle ilgili adımları anlatan bir e-posta gönderildi."
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr ""
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
msgid "You can now log in using your new password."
msgstr "Åimdi yeni parolanızı giriÅ için kullanabilirsiniz."
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "BaÅlık"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr ""
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr ""
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "Etiketler"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr "Etikerleri virgül ile ayırın."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr ""
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr ""
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr ""
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "Web sitesi"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr ""
-#: mediagoblin/edit/forms.py:63
-msgid "License preference"
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr "Medyama birisi yorum yazdıÄında bana e-posta at"
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
msgstr ""
#: mediagoblin/edit/forms.py:69
-msgid "This will be your default license on upload forms."
+msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
-msgstr "Medyama birisi yorum yazdıÄında bana e-posta at"
+#: mediagoblin/edit/forms.py:75
+msgid "This will be your default license on upload forms."
+msgstr ""
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr "Eski parola"
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr ""
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr "Yeni parola"
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "Parola"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
msgid "You are editing another user's media. Proceed with caution."
msgstr "BaÅka bir kullanıcının medyasını düzenlerken dikkatli davranın."
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr ""
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr ""
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
msgid "You are editing a user's profile. Proceed with caution."
msgstr "BaÅka bir kullanıcının profilini düzenlerken dikkatli davranın."
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr "Profil deÄiÅiklikleri kaydedildi"
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr "Hesap ayarları kaydedildi"
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr "YanlıŠparola"
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr "Parolanız baÅarılı bir Åekilde deÄiÅtirildi"
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr ""
@@ -297,19 +327,62 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr "Ãzgünüz, bu tip dosyaları desteklemiyoruz :("
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr ""
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr ""
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "Kullanıcı adı"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "E-posta adresi"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr "Kullanıcı adı veya E-posta"
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr ""
@@ -373,7 +446,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr ""
@@ -386,76 +459,226 @@ msgid "Your OAuth clients"
msgstr ""
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr "Ekle"
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr "Si"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "GiriÅ"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr "GiriÅ baÅarısız!"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr "Bu medya türü için geçersiz dosya türü."
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr "Dosya"
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr "Bir dosya saÄlamanız gerekir."
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr "Hoooop! Gönderildi!"
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr "E-postanızı doÄrulayın!"
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr "çıkıÅ"
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: 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 "GiriÅ"
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr "Hesap ayarlarını deÄiÅtir"
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: 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 "Madya iÅlem paneli"
+msgstr "Medya iÅlem paneli"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr "ÃıkıÅ"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Medya ekle"
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
@@ -502,6 +725,59 @@ msgstr ""
msgid "No processed entries, yet!"
msgstr ""
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -534,19 +810,15 @@ msgid ""
"a happy goblin!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "GiriÅ baÅarısız!"
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "Hala hesabınız yok mu?"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "Åimdi oluÅturun!"
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr "Parolanı mı unuttun?"
@@ -555,7 +827,7 @@ msgstr "Parolanı mı unuttun?"
msgid "Create an account!"
msgstr "Hesap oluÅtur!"
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr "OluÅtur"
@@ -589,7 +861,7 @@ msgstr ""
msgid "Explore"
msgstr "KeÅfet"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr ""
@@ -599,22 +871,27 @@ msgid ""
"extraordinarily great piece of media hosting software."
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
+msgid ""
+"\n"
+" >Create an account at this site
\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
+"\n"
+" Set up MediaGoblin on your own server"
msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
@@ -629,13 +906,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr ""
@@ -652,22 +929,29 @@ msgstr "İptal"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "DeÄiÅiklikleri kaydet"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
+msgid "Changing %(username)s's email"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr "Kaydet"
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -695,14 +979,14 @@ msgstr "%(media_title)s düzenleme"
msgid "Changing %(username)s's account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
-msgstr "Parolanızı deÄiÅtirin."
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
msgid "Delete my account"
msgstr "Hesabımı sil"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
@@ -714,6 +998,36 @@ msgstr ""
msgid "Editing %(username)s's profile"
msgstr "%(username)s profilini düzenleme"
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "%(formatted_time)s önce"
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -724,8 +1038,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr "İndir"
@@ -749,7 +1062,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr "Ãzgün dosya"
@@ -758,6 +1071,10 @@ msgstr "Ãzgün dosya"
msgid "WebM file (Vorbis codec)"
msgstr ""
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr "OluÅturuldu"
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -769,47 +1086,39 @@ msgstr ""
msgid "Image for %(media_title)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr "PDF dosya"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr "WebGL"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr "Dosya Biçimi"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr ""
@@ -828,7 +1137,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
@@ -855,11 +1164,6 @@ msgstr ""
msgid "Edit"
msgstr "Düzenle"
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr "Si"
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -914,29 +1218,22 @@ msgstr "%(username)s medyası"
msgid "â Browsing media by %(username)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr "Bir yorum ekle"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr "Bu yorumu ekle"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "%(formatted_time)s önce"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr "Eklendi"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr "OluÅturuldu"
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1095,26 +1392,34 @@ msgstr ""
msgid "Could not read the image file."
msgstr ""
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr "Amaninnn boo!"
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr ""
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr ""
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1151,9 +1456,8 @@ msgstr ""
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
+"You can use Markdown for formatting."
msgstr ""
#: mediagoblin/user_pages/forms.py:31
@@ -1176,77 +1480,80 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr "Maalesef, yorum devre dıÅı."
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr "Amaninnn boo, yorumunuz boÅtu."
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr "Yorumunuz gönderildi!"
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr "Medyayı sildiniz."
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "Medya silinmedi çünkü emin olduÄunuzu onaylamadınız."
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "BaÅka bir kullanıcının medyasını silerken dikkatli davranın."
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr ""
diff --git a/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.mo
new file mode 100644
index 0000000000000000000000000000000000000000..eed7eb84b4553a6112a634394a47bf8241d6d881
GIT binary patch
literal 30432
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
I&Uupm2l9QRx&QzG
literal 0
HcmV?d00001
diff --git a/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.po
index dd6525fc..bb856e09 100644
--- a/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/vi/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: 2013-06-16 20:06-0500\n"
-"PO-Revision-Date: 2013-08-26 15:12+0000\n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 19:18+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/mediagoblin/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -18,250 +18,280 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: mediagoblin/auth/forms.py:25
-msgid "Username"
-msgstr ""
-
-#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:44
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr ""
-
-#: mediagoblin/auth/forms.py:33
-msgid "Email address"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
msgstr ""
-#: mediagoblin/auth/forms.py:40
-msgid "Username or Email"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
msgstr ""
-#: mediagoblin/auth/forms.py:51
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr ""
-#: mediagoblin/auth/tools.py:42
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr ""
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr ""
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr ""
-#: mediagoblin/auth/tools.py:109
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr ""
-#: mediagoblin/auth/tools.py:113
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr ""
-#: mediagoblin/auth/views.py:43
-msgid "Sorry, registration is disabled on this instance."
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
msgstr ""
-#: mediagoblin/auth/views.py:133
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr ""
-#: mediagoblin/auth/views.py:139
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr ""
-#: mediagoblin/auth/views.py:157
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr ""
-#: mediagoblin/auth/views.py:165
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr ""
-#: mediagoblin/auth/views.py:178
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr ""
-#: mediagoblin/auth/views.py:209
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:220
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:223
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:230
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr ""
-#: mediagoblin/auth/views.py:287
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr ""
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr ""
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr ""
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr ""
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr ""
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr ""
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr ""
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr ""
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr ""
-#: mediagoblin/edit/forms.py:63
-msgid "License preference"
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
msgstr ""
#: mediagoblin/edit/forms.py:69
-msgid "This will be your default license on upload forms."
+msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
+#: mediagoblin/edit/forms.py:75
+msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr ""
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr ""
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr ""
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
msgid "You are editing another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr ""
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr ""
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
msgid "You are editing a user's profile. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr ""
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr ""
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr ""
@@ -296,19 +326,62 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr ""
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr ""
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr ""
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr ""
@@ -372,7 +445,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr ""
@@ -385,59 +458,209 @@ msgid "Your OAuth clients"
msgstr ""
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr ""
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr ""
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr ""
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr ""
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr ""
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -445,16 +668,16 @@ msgstr ""
msgid "Media processing panel"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
@@ -501,6 +724,59 @@ msgstr ""
msgid "No processed entries, yet!"
msgstr ""
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -533,19 +809,15 @@ msgid ""
"a happy goblin!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr ""
@@ -554,7 +826,7 @@ msgstr ""
msgid "Create an account!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr ""
@@ -588,7 +860,7 @@ msgstr ""
msgid "Explore"
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr ""
@@ -598,22 +870,27 @@ msgid ""
"extraordinarily great piece of media hosting software."
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
+msgid ""
+"\n"
+" Set up MediaGoblin on your own server"
msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
@@ -628,13 +905,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:193
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr ""
@@ -651,22 +928,29 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
+msgid "Changing %(username)s's email"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -694,12 +978,12 @@ msgstr ""
msgid "Changing %(username)s's account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
+msgid "Delete my account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
-msgid "Delete my account"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
@@ -713,6 +997,36 @@ msgstr ""
msgid "Editing %(username)s's profile"
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -723,8 +1037,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr ""
@@ -748,7 +1061,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr ""
@@ -761,13 +1074,6 @@ msgstr ""
msgid "Created"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -779,47 +1085,39 @@ msgstr ""
msgid "Image for %(media_title)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr ""
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
msgstr ""
@@ -838,7 +1136,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
+msgid "WebM file (VP8/Vorbis)"
msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
@@ -865,11 +1163,6 @@ msgstr ""
msgid "Edit"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -924,15 +1217,19 @@ msgstr ""
msgid "â Browsing media by %(username)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr ""
@@ -1094,26 +1391,34 @@ msgstr ""
msgid "Could not read the image file."
msgstr ""
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr ""
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr ""
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr ""
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1150,9 +1455,8 @@ msgstr ""
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
+"You can use Markdown for formatting."
msgstr ""
#: mediagoblin/user_pages/forms.py:31
@@ -1175,77 +1479,80 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr ""
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr ""
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr ""
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr ""
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr ""
diff --git a/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.mo
new file mode 100644
index 0000000000000000000000000000000000000000..6b3d085f4db96a240be0f9e0c042b0de99743590
GIT binary patch
literal 24298
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
literal 0
HcmV?d00001
diff --git a/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.mo
index 1ed5a4f14b153c1765f030c8b4805fe86d7c5f4e..aecbd5e027d08972b8aa93fe0873e938d9c5b350 100644
GIT binary patch
delta 10546
zcmd7W34B!5y}Pk>;oTI=iM!^iJE
zcR9=d{Lh(#5ABS3=}=7MjozI%X#6RO(X@fsCtgY?{`BahX-yOpa2&42WPAVz;Y&Ce
zKgK-l)0et%8Ybc8H~=>zuW0wH`%hyxO^ayna6#MJd)Na%zydsqW6(t{x#-18{28v{
zgCkf(xw*g7&~LF5| _t*t4-7Wgt6I>i+;;_z#Suea%I8yJI0r&&rU&
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
UR!;6~y;k{?uQ?c7b<1A-UwXa>Bme*a
delta 5128
zcma*pdsviJ9>DQ4cp>qQh^Qztct_ps<%U9{b5)ih?nCpUXCyQ#I`AMd-*{<+H|e9k#@&hMP_JLi4J
zPZ}+CwHEKy(B{u6etzLMlHWEDN$tNs_uDJggX#l}!tNcEipLQ+8VfNTk6<@Ek70P#
zY`=pNGNhwY7VLy=urpp$%B!L&B+?KRs#G#2V;nBVSy+t~jQk#lQ(r@LnXnd{;YDN)
z^)a@^dgPz_mOt$pL-p_Pv;amvJ)o
zWEIKiL<#%?%0$PpHJ(OU;00vu>K)vLSFk0Pbx|ss`PCW<{8Rh*Lu_>l`{PBl;*TgP
z>l#5Cu`d!sC15aS;1JBlp12Wzg9lJH7S+|5a1zQwvQg$)fL>Yo3JMZv3(Cr#MNUQS
zLK*N1Hpe$mc6J_RqKn8J>T8s<59W`wN28p1I?54DMj1a7Wg~M@?%LvR-lA*lbM(Q6&$wV2-
z&Uc{n--D8o!zl63nC+KP7JeO@%k%#O1qpD!sezl>N2wXqZFmq@psYNqukpNRpj@Ig
z*mUM7seBs~upVb&ct0L7T!NB;%h(*RBYRK*%w&EQLiF*NhZArQ%H#1R7Nb1G@|3tx
zc2a?lU=3#BcPI-Q7sERQOE4Bgxye>cM~OEd>8iY@htbRC)W;NZ@h4o1Swxdp@I{=5
zzhWZJ8*JPGjdQ8*LOJsvu^F~xR@q?)K7{R2jv&G`2IUftMA^u+Sn_YBP(XuBxEWjE
zDU=o0nH~R$!PM`f1bBe$umgkS2%=E>k3u%DX5pi_5i{^}9EZK*c>=Hi$6!r7`5!^y
zIt{C^2M4$jcO%JAR<)I0`fHqJ?J_CAE3Oj0Ke<$E`Gu#y7DuT80}7?1EB{MH%-n
zwm~}*P8Flvi4wda&;L3KWK%iFlcZ*+={q=&`hB!9@^Q|IQ&QfM#stSvc6tG2g7-{6
zL&<1^S^wEIm|aP~Fl>)D43+0UfkJN@9!AN46QyG*$^>gsCay58MIK#s6K&Wr&FG(m
zGJXuoxXEUFj_F)nM*Cv(^BXu&p8uN^WW}Ayr=+ew4!|_*fdwdmH=zXHirsLBS^opd
zB|e3Gv8lW0!j5B%1(u_X+m90eWt0v63B5AlJqj|xO_YvzP!{wvO2@Y8Mte6?8#XNz
zrC*v^&q2vdK1!TtP{waJ>-$mqzl<{PxpeX$PT^A;MwP43_pZ)A87f
z`V^ES$TM}JWULZH@jx#5??vGx4axX9w!n^$8awKOlG;?131(tvoQE>;GL)lOkMgEG
zh;eux yt=A&e;+N@vBBmdH&760K|f}>22q3qc9m~l6zp#=1x?EE#;<};16
z%tcA)YKU%c3KqoVq${k?v((tzWce=?GhjuiRE0
zQPf%`T5LbbrxF}*`0-sg*N?uKUc>rdyzwBIm)d6iK~zHck0*yn?v1p
zkJD9bEp~aV_QFC}nPZ{$#MpJ>oIGFpz$+GC_Tb*HVVkZaG+cPzA)IXwl6
za;a~5;?owLG31g?NgkvVQ@Z$GN-k;EIzPYAVV&;s*gXy%HhiSsIDB)Nh6d2G7=U~HNmGOk=7?-lO5G0tiUNgkXy)S8f#
znmk0e8Q*h6%HV_)YeGV5e9FLhenO_$OFe^g-S*mCAcc`)AW&g<&4ZAl4_Eh<|?DOwBRA0L#u=OYtSf|RRnb>q`
zWE$0UNy;)ZgY?zOgLT);H}r@Z33|ws$J%>bMbTdEbQRlTGjB?yv)IVnND
z-E-?L+HHSa-?P`W4b)UL9DPF>_?9imw&;f(&+9rzFJFg6smD=Pw3zYpyAZR5Ek
zdXh6!zwO-CBe1=KUEe-iDR=7j+3LLPVR3mb_k3sR?X#PG#ZNX5(ld(Y_|l8ITlBBR
c+4Ad~UDD2?Z!8(DSGuG1dG}$xzVzdN1F}$b`Tzg`
diff --git a/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.po
index 4bb714fe..b3757f2e 100644
--- a/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-05-27 13:54-0500\n"
-"PO-Revision-Date: 2013-06-16 11:06+0000\n"
-"Last-Translator: m13253 \n"
+"POT-Creation-Date: 2013-08-26 14:18-0500\n"
+"PO-Revision-Date: 2013-08-26 19:18+0000\n"
+"Last-Translator: cwebber \n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mediagoblin/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,250 +23,280 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: mediagoblin/auth/forms.py:26
-msgid "Username"
-msgstr "ç¨æ·å"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-#: mediagoblin/tests/test_util.py:110
-msgid "Password"
-msgstr "å¯ç "
-
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "çµåé®ä»¶å°å"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "æ±æï¼æ¬ç«å·²æå注åã"
-#: mediagoblin/auth/forms.py:41
-msgid "Username or Email"
-msgstr "ç¨æ·åæçµåé®ä»¶"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
-#: mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:25
msgid "Username or email"
msgstr "ç¨æ·åæçµåé®ä»¶"
-#: mediagoblin/auth/tools.py:31
+#: mediagoblin/auth/tools.py:41
msgid "Invalid User name or email address."
msgstr "æ æç¨æ·åæçµåé®ä»¶å°åã"
-#: mediagoblin/auth/tools.py:32
+#: mediagoblin/auth/tools.py:42
msgid "This field does not take email addresses."
msgstr "æ¤å段ä¸è½å¡«åçµåé®ä»¶å°åã"
-#: mediagoblin/auth/tools.py:33
+#: mediagoblin/auth/tools.py:43
msgid "This field requires an email address."
msgstr "æ¤å段éå¡«åçµåé®ä»¶å°åã"
-#: mediagoblin/auth/views.py:54
-msgid "Sorry, registration is disabled on this instance."
-msgstr "æ±æï¼æ¬ç«å·²æå注åã"
-
-#: mediagoblin/auth/views.py:68
+#: mediagoblin/auth/tools.py:146
msgid "Sorry, a user with that name already exists."
msgstr "æ±æï¼è¯¥ç¨æ·åå·²åå¨ã"
-#: mediagoblin/auth/views.py:72
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
msgid "Sorry, a user with that email address already exists."
msgstr "æ±æï¼å·²æç¨æ·ç¨è¯¥çµåé®ä»¶æ³¨åã"
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:161
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "æ¨ççµåé®ä»¶å°å已认è¯ãæ¨ç°å¨å¯ä»¥ç»å½ãä¿®æ¹ä¸ªäººèµæå¹¶ä¸ä¼ å¾çäºï¼"
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
msgid "The verification key or user id is incorrect"
msgstr "éªè¯ç é误æç¨æ· ID é误"
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
msgid "You must be logged in so we know who to send the email to!"
msgstr "æ¨å¿
é¡»ç»å½ä»¥ä¾¿è®©æä»¬ç¥éå°çµåé®ä»¶åç»è°"
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
msgid "You've already verified your email address!"
msgstr "æ¨å·²ç»è®¤è¯è¿çµåé®ä»¶å°åäºï¼"
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
msgid "Resent your verification email."
msgstr "éå认è¯é®ä»¶ã"
-#: mediagoblin/auth/views.py:258
+#: mediagoblin/auth/views.py:237
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
msgstr "è¥è¯¥é®ä»¶å°åï¼åºå大å°åï¼å·²è¢«æ³¨åï¼åå¯ç ä¿®æ¹è¯´æå·²éè¿çµåé®ä»¶éè¾¾ã"
-#: mediagoblin/auth/views.py:269
+#: mediagoblin/auth/views.py:248
msgid "Couldn't find someone with that username."
msgstr "æ¾ä¸å°æè¯¥ç¨æ·åç人ã"
-#: mediagoblin/auth/views.py:272
+#: mediagoblin/auth/views.py:251
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "å¯ç ä¿®æ¹è¯´æå·²éè¿çµåé®ä»¶éè¾¾ã"
-#: mediagoblin/auth/views.py:279
+#: mediagoblin/auth/views.py:258
msgid ""
"Could not send password recovery email as your username is inactive or your "
"account's email address has not been verified."
msgstr "æ æ³åéå¯ç æ¾åé®ä»¶ï¼å 为æ¨çç¨æ·åæªæ¿æ´»æè
æ¨è´¦æ·ççµåé®ä»¶å°åæªè®¤è¯ã"
-#: mediagoblin/auth/views.py:336
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:323
msgid "You can now log in using your new password."
msgstr "æ¨ç°å¨å¯ä»¥ç¨æ°çå¯ç æ¥ç»å½äºï¼"
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
msgstr "æ é¢"
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
msgid "Description of this work"
msgstr "该ä½åçæè¿°"
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
msgstr "æ¨å¯ä»¥ç¨ Markdown æ¥æçã"
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
msgid "Tags"
msgstr "æ ç¾"
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
msgstr "ç¨éå·åéæ ç¾ã"
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
msgid "Slug"
msgstr "ç®ç§°"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
msgid "The slug can't be empty"
msgstr "ç®ç§°ä¸è½ä¸ºç©º"
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
msgstr "该åªä½ç½åçæ é¢é¨ä»½ãé常ä¸éè¦ä¿®æ¹ã"
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
msgstr "许å¯è¯"
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
msgid "Bio"
msgstr "个æ§ç¾å"
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
msgid "Website"
msgstr "ç½ç«"
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
msgid "This address contains errors"
msgstr "æ¬ç½ååºéäº"
-#: mediagoblin/edit/forms.py:63
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr "å½æäººå¯¹æçåªä½è¯è®ºæ¶ç»æçµåé®ä»¶"
+
+#: mediagoblin/edit/forms.py:67
+msgid "Enable/Disable insite notifications"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:69
msgid "License preference"
msgstr "许å¯è¯å好"
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:75
msgid "This will be your default license on upload forms."
msgstr "è¿å°æ¯æ¨ä¸ä¼ çé¢çé»è®¤è®¸å¯è¯ã"
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
-msgstr "å½æäººå¯¹æçåªä½è¯è®ºæ¶ç»æçµåé®ä»¶"
-
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
msgid "The title can't be empty"
msgstr "æ é¢ä¸è½æ¯ç©ºç"
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "è¿ä¸ªåéçæè¿°"
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr "æ¤åéç½åçæ é¢é¨ä»½ï¼é常ä¸éè¦ä¿®æ¹ã"
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:103
msgid "Old password"
msgstr "æ§çå¯ç "
-#: mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:105
msgid "Enter your old password to prove you own this account."
msgstr "è¾å
¥æ¨çæ§å¯ç æ¥è¯ææ¨æ¥æè¿ä¸ªè´¦æ·ã"
-#: mediagoblin/edit/forms.py:104
+#: mediagoblin/edit/forms.py:108
msgid "New password"
msgstr "æ°å¯ç "
-#: mediagoblin/edit/views.py:67
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "å¯ç "
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:73
msgid "An entry with that slug already exists for this user."
msgstr "è¿ä¸ªç®ç§°å·²ç»è¢«å«äººç¨äº"
-#: mediagoblin/edit/views.py:85
+#: mediagoblin/edit/views.py:91
msgid "You are editing another user's media. Proceed with caution."
msgstr "æ¨æ£å¨ä¿®æ¹å«äººçåªä½ï¼è¯·å°å¿æä½ã"
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:161
#, python-format
msgid "You added the attachment %s!"
msgstr "æ¨å ä¸äºéä»¶â%sâï¼"
-#: mediagoblin/edit/views.py:182
+#: mediagoblin/edit/views.py:188
msgid "You can only edit your own profile."
msgstr "æ¨åªè½ä¿®æ¹èªå·±çä¸ªäººèµæ"
-#: mediagoblin/edit/views.py:188
+#: mediagoblin/edit/views.py:194
msgid "You are editing a user's profile. Proceed with caution."
msgstr "æ¨æ£å¨ä¿®æ¹å«äººçä¸ªäººèµæï¼è¯·å°å¿æä½ã"
-#: mediagoblin/edit/views.py:204
+#: mediagoblin/edit/views.py:210
msgid "Profile changes saved"
msgstr "ä¸ªäººèµæå·²ä¿®æ¹"
-#: mediagoblin/edit/views.py:240
+#: mediagoblin/edit/views.py:247
msgid "Account settings saved"
msgstr "è´¦æ·è®¾ç½®å·²ä¿å"
-#: mediagoblin/edit/views.py:274
+#: mediagoblin/edit/views.py:281
msgid "You need to confirm the deletion of your account."
msgstr "æ¨éè¦ç¡®è®¤å 餿¨çè´¦æ·ã"
-#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
-#: mediagoblin/user_pages/views.py:222
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "æ¨å·²ç»æä¸ä¸ªç§°åâ%sâçåéäºï¼"
-#: mediagoblin/edit/views.py:314
+#: mediagoblin/edit/views.py:321
msgid "A collection with that slug already exists for this user."
msgstr "è¯¥ç¨æ·å·²ç»æä½¿ç¨è¯¥ç®ç§°çåéäºã"
-#: mediagoblin/edit/views.py:329
+#: mediagoblin/edit/views.py:336
msgid "You are editing another user's collection. Proceed with caution."
msgstr "æ¨æ£å¨ä¿®æ¹å«äººçåéï¼è¯·å°å¿æä½ã"
-#: mediagoblin/edit/views.py:348
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
msgid "Wrong password"
msgstr "å¯ç é误"
-#: mediagoblin/edit/views.py:363
+#: mediagoblin/edit/views.py:374
msgid "Your password was changed successfully"
msgstr "æ¨çå¯ç å·²æåä¿®æ¹"
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr ""
+
#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr "æ æ³é¾æ¥å°ä¸»é¢â¦â¦æªè®¾ç½®ä¸»é¢\n"
@@ -301,19 +331,62 @@ msgid ""
"domain."
msgstr "CSRF cookie ä¸åå¨ãå¾å¯è½æ¯ç±ç±»ä¼¼ cookie å±è½å¨é æçã 请å
许æ¬ååç cookie 设å®ã"
-#: mediagoblin/media_types/__init__.py:111
-#: mediagoblin/media_types/__init__.py:155
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
msgid "Sorry, I don't support that file type :("
msgstr "æ±æï¼æä¸æ¯æè¿æ ·çæä»¶æ ¼å¼ :("
-#: mediagoblin/media_types/pdf/processing.py:136
+#: mediagoblin/media_types/pdf/processing.py:142
msgid "unoconv failing to run, check log file"
msgstr "æ æ³è¿è¡ unoconvï¼è¯·æ£æ¥æ¥å¿"
-#: mediagoblin/media_types/video/processing.py:37
+#: mediagoblin/media_types/video/processing.py:44
msgid "Video transcoding failed"
msgstr "è§é¢è½¬ç 失败"
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr "卿¨çå
å®¹å¼ è´´è¯è®º"
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "ç¨æ·å"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "çµåé®ä»¶å°å"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr "ç¨æ·åæçµåé®ä»¶"
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
msgstr "ä½ç½®"
@@ -377,7 +450,7 @@ msgstr "æ¤åºç¨ç¨åºçéå®å URIï¼æ¬å段å¨å
¬å¼ç±»åç OAuth clie
msgid "This field is required for public clients"
msgstr "æ¬å段å¨å
¬å¼ç±»åç OAuth client 为å¿
å¡«"
-#: mediagoblin/plugins/oauth/views.py:56
+#: mediagoblin/plugins/oauth/views.py:55
msgid "The client {0} has been registered!"
msgstr "OAuth client {0} 注å宿ï¼"
@@ -390,59 +463,209 @@ msgid "Your OAuth clients"
msgstr "æ¨ç OAuth client"
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
#: mediagoblin/templates/mediagoblin/submit/start.html:34
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
msgid "Add"
msgstr "å¢å "
-#: mediagoblin/processing/__init__.py:193
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr "å é¤"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "ç»å½"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr "ç»å½å¤±è´¥ï¼"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Person email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:414
msgid "Invalid file given for media type."
msgstr "æä¾æä»¶çåªä½ç±»åé误ã"
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr ""
+
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr "æä»¶"
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:52
msgid "You must provide a file."
msgstr "æ¨å¿
é¡»æä¾ä¸ä¸ªæä»¶"
-#: mediagoblin/submit/views.py:93
+#: mediagoblin/submit/views.py:101
msgid "Woohoo! Submitted!"
msgstr "ååï¼å·²æäº¤ï¼"
-#: mediagoblin/submit/views.py:144
+#: mediagoblin/submit/views.py:154
#, python-format
msgid "Collection \"%s\" added!"
msgstr "åéâ%sâå·²æ°å¢ï¼"
-#: mediagoblin/templates/mediagoblin/base.html:67
+#: mediagoblin/templates/mediagoblin/base.html:79
msgid "Verify your email!"
msgstr "确认æ¨ççµåé®ä»¶ï¼"
-#: mediagoblin/templates/mediagoblin/base.html:68
+#: mediagoblin/templates/mediagoblin/base.html:86
msgid "log out"
msgstr "ç»åº"
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr "ç»å½"
-
-#: mediagoblin/templates/mediagoblin/base.html:82
+#: mediagoblin/templates/mediagoblin/base.html:105
#, python-format
msgid "%(user_name)s's account"
msgstr "%(user_name)s çè´¦æ·"
-#: mediagoblin/templates/mediagoblin/base.html:89
+#: mediagoblin/templates/mediagoblin/base.html:112
msgid "Change account settings"
msgstr "æ´æ¹è´¦æ·è®¾ç½®"
-#: mediagoblin/templates/mediagoblin/base.html:93
-#: mediagoblin/templates/mediagoblin/base.html:108
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -450,16 +673,16 @@ msgstr "æ´æ¹è´¦æ·è®¾ç½®"
msgid "Media processing panel"
msgstr "åªä½å¤ç颿¿"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:125
msgid "Log out"
msgstr "ç»åº"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:128
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "æ°å¢åªä½"
-#: mediagoblin/templates/mediagoblin/base.html:102
+#: mediagoblin/templates/mediagoblin/base.html:131
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "æ°å¢åé"
@@ -506,6 +729,59 @@ msgstr "æè¿ 10 次æåä¸ä¼ ç纪å½"
msgid "No processed entries, yet!"
msgstr "ç°å¨è¿æ²¡æå¤çç纪å½ï¼"
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, meida, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
@@ -538,19 +814,15 @@ msgid ""
"a happy 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!"
-msgstr "ç»å½å¤±è´¥ï¼"
-
#: mediagoblin/templates/mediagoblin/auth/login.html:44
msgid "Don't have an account yet?"
msgstr "è¿æ²¡æè´¦æ·åï¼"
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
msgid "Create one here!"
msgstr "å¨è¿é建ç«ä¸ä¸ªå§ï¼"
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
msgid "Forgot your password?"
msgstr "å¿äºå¯ç åï¼"
@@ -559,7 +831,7 @@ msgstr "å¿äºå¯ç åï¼"
msgid "Create an account!"
msgstr "建ç«ä¸ä¸ªè´¦æ·ï¼"
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
msgid "Create"
msgstr "建ç«"
@@ -593,7 +865,7 @@ msgstr "以 AGPL
msgid "Explore"
msgstr "æ¢ç´¢"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23
msgid "Hi there, welcome to this MediaGoblin site!"
msgstr "å¿ï¼æ¬¢è¿æ¥å° MediaGoblin ç«ï¼ "
@@ -603,23 +875,28 @@ msgid ""
"extraordinarily great piece of media hosting software."
msgstr "æ¬ç«ä½¿ç¨ MediaGoblinââä¸ä¼ä¸åçåªä½å享ç½ç«ã"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
msgid ""
"To add your own media, place comments, and more, you can log in with your "
"MediaGoblin account."
msgstr "æ¨å¯ä»¥ç»å½æ¨ç MediaGoblin è´¦æ·ä»¥ä¸ä¼ åªä½ãå¼ è´´è¯è®ºççã"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
msgid "Don't have one yet? It's easy!"
msgstr "没æè´¦æ·åï¼å¼è´¦æ·å¾ç®åï¼"
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
-#, python-format
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "卿¬ç«åå»ºå¸æ·\n æè
\n 卿¨èªå·±çæå¡å¨ä¸æå»º MediaGoblin"
+"\n"
+" >Create an account at this site\n"
+" or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
+msgid ""
+"\n"
+" Set up MediaGoblin on your own server"
+msgstr ""
#: mediagoblin/templates/mediagoblin/bits/logo.html:23
#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
@@ -633,13 +910,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr "ç¼è¾ %(media_title)s çéä»¶"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
msgid "Attachments"
msgstr "éä»¶"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
msgid "Add attachment"
msgstr "æ°å¢éä»¶"
@@ -656,22 +933,29 @@ msgstr "åæ¶"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
msgid "Save changes"
msgstr "ä¿åæ´æ¹"
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
#, python-format
-msgid "Changing %(username)s's password"
-msgstr "ä¿®æ¹ %(username)s çå¯ç "
+msgid "Changing %(username)s's email"
+msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
msgid "Save"
msgstr "ä¿å"
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr "ä¿®æ¹ %(username)s çå¯ç "
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -699,14 +983,14 @@ msgstr "ç¼è¾ %(media_title)s"
msgid "Changing %(username)s's account settings"
msgstr "æ£å¨æ¹å %(username)s çè´¦æ·è®¾ç½®"
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
-msgid "Change your password."
-msgstr "ä¿®æ¹æ¨çå¯ç ã"
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
msgid "Delete my account"
msgstr "å 餿ç叿·"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
@@ -718,6 +1002,36 @@ msgstr "ç¼è¾ %(collection_title)s"
msgid "Editing %(username)s's profile"
msgstr "ç¼è¾ %(username)s çä¸ªäººèµæ"
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "%(formatted_time)så"
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/listings/collection.html:30
#: mediagoblin/templates/mediagoblin/listings/collection.html:35
#: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -728,8 +1042,7 @@ 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/pdf.html:65
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
msgstr "ä¸è½½"
@@ -753,7 +1066,7 @@ msgid ""
msgstr "æ¨å¯ä»¥å¨ http://getfirefox.com åå¾å¯ä»¥ææ¾æ¤å£°é³çæµè§å¨ï¼"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr "æºæä»¶"
@@ -762,6 +1075,10 @@ msgstr "æºæä»¶"
msgid "WebM file (Vorbis codec)"
msgstr "WebM æä»¶ï¼Vorbis ç¼ç ï¼"
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr "å·²å建"
+
#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
@@ -773,49 +1090,41 @@ msgstr "WebM æä»¶ï¼Vorbis ç¼ç ï¼"
msgid "Image for %(media_title)s"
msgstr "%(media_title)s çç
§ç"
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
msgid "PDF file"
msgstr "PDF æä»¶"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr "忢æè½¬"
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
msgstr "éè§"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
msgid "Front"
msgstr "æ£é¢"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
msgid "Top"
msgstr "é¡¶é¢"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Side"
msgstr "ä¾§é¢"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
msgid "WebGL"
msgstr "WebGL"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
msgid "Download model"
msgstr "ä¸è½½æ¨¡å"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
msgid "File Format"
msgstr "æä»¶æ ¼å¼"
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
msgid "Object Height"
-msgstr "对象é«åº¦"
+msgstr "ç©ä½é«åº¦"
#: mediagoblin/templates/mediagoblin/media_displays/video.html:44
msgid ""
@@ -832,8 +1141,8 @@ msgid ""
msgstr "æ¨å¯ä»¥å¨ http://getfirefox.com åå¾å¯ä»¥ææ¾æ¤è§é¢çæµè§å¨ï¼"
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
-msgid "WebM file (640p; VP8/Vorbis)"
-msgstr "WebM æä»¶ï¼640pï¼VP8/Vorbisï¼"
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
@@ -859,11 +1168,6 @@ msgstr "%(collection_title)s by %(username)s"
msgid "Edit"
msgstr "ç¼è¾"
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
-msgid "Delete"
-msgstr "å é¤"
-
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
@@ -918,29 +1222,22 @@ msgstr "%(username)s çåªä½"
msgid "â Browsing media by %(username)s"
msgstr "â æµè§ %(username)s çåªä½"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
msgid "Add a comment"
msgstr "æ°å¢è¯è®º"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
msgid "Add this comment"
msgstr "å¢å è¯è®º"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:164
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "%(formatted_time)så"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
+msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
msgid "Added"
msgstr "å·²å¢å "
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
-msgid "Created"
-msgstr "å·²å建"
-
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
#, python-format
@@ -1099,26 +1396,34 @@ msgstr "æ ç¾"
msgid "Could not read the image file."
msgstr "æ æ³è¯»åå¾çæä»¶ã"
-#: mediagoblin/tools/response.py:35
+#: mediagoblin/tools/response.py:36
msgid "Oops!"
msgstr "ç³ç³ï¼"
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:37
msgid "An error occured"
msgstr "åçé误"
#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:60
msgid "Operation not allowed"
msgstr "æä½ä¸å
许"
-#: mediagoblin/tools/response.py:52
+#: mediagoblin/tools/response.py:61
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:60
+#: mediagoblin/tools/response.py:69
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"
@@ -1155,10 +1460,9 @@ msgstr "è¯è®º"
#: mediagoblin/user_pages/forms.py:25
msgid ""
-"You can use Markdown for"
-" formatting."
-msgstr "æ¨å¯ä»¥ç¨ Markdown æ¥æçã"
+"You can use Markdown for formatting."
+msgstr ""
#: mediagoblin/user_pages/forms.py:31
msgid "I am sure I want to delete this"
@@ -1180,77 +1484,80 @@ msgstr "â è¯·éæ© â"
msgid "Include a note"
msgstr "å æ³¨"
-#: mediagoblin/user_pages/lib.py:58
-msgid "commented on your post"
-msgstr "卿¨çå
å®¹å¼ è´´è¯è®º"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+" \n"
+" Markdown for formatting."
+msgstr ""
-#: mediagoblin/user_pages/views.py:169
+#: mediagoblin/user_pages/views.py:179
msgid "Sorry, comments are disabled."
msgstr "æ±æï¼ä¸å¼æ¾è¯è®ºã"
-#: mediagoblin/user_pages/views.py:174
+#: mediagoblin/user_pages/views.py:184
msgid "Oops, your comment was empty."
msgstr "åï¼æ¨çè¯è®ºæ¯ç©ºçã"
-#: mediagoblin/user_pages/views.py:180
+#: mediagoblin/user_pages/views.py:190
msgid "Your comment has been posted!"
msgstr "æ¨çè¯è®ºå·²ç»å¼ è´´å®æï¼"
-#: mediagoblin/user_pages/views.py:205
+#: mediagoblin/user_pages/views.py:225
msgid "Please check your entries and try again."
msgstr "è¯·æ£æ¥é¡¹ç®å¹¶éè¯ã"
-#: mediagoblin/user_pages/views.py:245
+#: mediagoblin/user_pages/views.py:265
msgid "You have to select or add a collection"
msgstr "æ¨éè¦éæ©ææ¯æ°å¢ä¸ä¸ªåé"
-#: mediagoblin/user_pages/views.py:256
+#: mediagoblin/user_pages/views.py:276
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "â%sâå·²ç»å¨â%sâåé"
-#: mediagoblin/user_pages/views.py:262
+#: mediagoblin/user_pages/views.py:282
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "â%sâå å
¥â%sâåé"
-#: mediagoblin/user_pages/views.py:282
+#: mediagoblin/user_pages/views.py:302
msgid "You deleted the media."
msgstr "æ¨å·²ç»å 餿¤åªä½ã"
-#: mediagoblin/user_pages/views.py:289
+#: mediagoblin/user_pages/views.py:314
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "ç±äºæ¨æ²¡æå¾é确认ï¼è¯¥åªä½æ²¡æè¢«ç§»é¤ã"
-#: mediagoblin/user_pages/views.py:296
+#: mediagoblin/user_pages/views.py:321
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "æ¨æ£å¨å é¤å«äººçåªä½ï¼è¯·å°å¿æä½ã"
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
msgid "You deleted the item from the collection."
msgstr "æ¨å·²ç»ä»è¯¥åéä¸å é¤è¯¥é¡¹ç®ã"
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
msgid "The item was not removed because you didn't check that you were sure."
msgstr "ç±äºæ¨æ²¡æå¾é确认ï¼è¯¥é¡¹ç®æ²¡æè¢«ç§»é¤ã"
-#: mediagoblin/user_pages/views.py:382
+#: mediagoblin/user_pages/views.py:407
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr "æ¨æ£å¨ä»å«äººçåéä¸å é¤é¡¹ç®ï¼è¯·å°å¿æä½ã"
-#: mediagoblin/user_pages/views.py:415
+#: mediagoblin/user_pages/views.py:440
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "æ¨å·²ç»å é¤â%sâåéã"
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:447
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr "ç±äºæ¨æ²¡æå¾é确认ï¼è¯¥åéæ²¡æè¢«ç§»é¤ã"
-#: mediagoblin/user_pages/views.py:430
+#: mediagoblin/user_pages/views.py:455
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr "æ¨æ£å¨å é¤å«äººçåéï¼è¯·å°å¿æä½ã"
diff --git a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo
index c234ff007f8e3fad0648b3ec8d7d7b6de2712c6d..04664c86a6c85bce60be397382b19dd96405b037 100644
GIT binary patch
literal 30454
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∾{x4~Q-9}VW233*ua7P6QlO67+H>PXGMNIT)%eR)uU@SjIO^n
zT=&xPbsI+4UbA*B2}cj|EuV^BB;7{RUA2~f2DI%vI-w|?eV42;9+n9-CJAUZ`5!k{
zFcS0SYSyY~Dz}9<(&-lS_|b_ts*Q)+m>Oz&JUkI4d}A>Z4sT7SuNeu$Vej6xe`3>s
zWGc20q~rhUV_gj#!{u4VWB1G)nYgW_Y{o_g4pdu>s5-h+6Q}Vot=nb3dENDdK6mByL~T^lpK-ncx*MlkWm0~{n
zo2-n78zz(Hz^*veo?}c0&5ws$BR=y8*OoSxt{vzc_dqB5r%Y^Lr1+$+f69b2Kfw}h
zMb9*@f6ByG>HDWl`ln3f_{}@mk(K@_lm01_{wWiGhQ%ENIq|EGlO7N8(=APCwMM`Z
z9PK$NvR$wMYjcK^J}p9ePH3~;*V@Lm#N&l3I{XZD`r%X7K*gs{$Zd(78N&l1y
z%lPdNRr{w*Y`cSRGB_C0KV_mrBl_Q7_^ld!?%2IS!yddl^X3!uPnl>s(?4ZmTEXPF
zCsyyDGVxy+@>Mrmo&8fL?3@>0@bFQoeZ|^8Wnza|`ln2EoU4DzB;o&YXERNj3d
z*8W_h`v8mo)X6sdyT5hQcjUGywBQhn`zFdVq>TP4lZoDMiJtYrj{YeVzMAU&>|URG
z_fMHDerQFjmtp^u2|D9H-ZN$4|ebd|Z^;`dxN&CA^J0H?NWn%vW
zVSV@6KV{NB_hQrXC7%{4PRsaDT9^D@?;(-SciKN;21}}R=S%GVDU)XC=LG#zCSA_L
x{cL|+=s&W3R;MWXr%X7O$BuRCS({{cYlryl?S
delta 4912
zcmeI!`%{$H9mnyrfTDI5lg5r|?U<%Do#@zB#TvC{Ow#6})=bp&{o#2!`49S29pH7&v(IzR
z_k6$S?Bjz^U0?j#6nfwxD1PN4{qei2RMp;Gox$5
zlNgK_kU7i;*b#3bKjsVmbi&YRW7=ak)O~L3io>xJ^P9;u2616Fw!voShV@Q=7iMt%
zHO$3Jn1_9cA|1V`fnP^W^aggo)2IN?A+eixaW`JWw%FL+n0V$l%{2Hi`}o7y<`gF4
z1$5&>RLXk9kVYJUjA4djDCXh_EW$px0axMy)WYI=*b`1e1yY2Xrxg8)yorVe+JcH~
z2T~QY8}+~u48gZiD|-hu(FJ4<^G{UmL;0iY@u-^Tph}R3dVW4?A&XFZZCOw9&*ID`
zF6hC%I1taEYIz5hiTlVLrcW=s6q%@ieW-yOQGu;St!xvjl&?A058zb#Z(tHW#5I@@
zOa3p@*iSemxQeYl1Y1xk4I`>J9EX{>7@KhyHeq)@RA4WmPRS9}<~omB`8Di^pI|&j
zxa~}(p%zf+r=b+jL8Z)#DnTvkh9=bK>rexKA65H9$e88~s)W~3CHoAOk)XbIszXr|
zN1?_UiF!T{NviRCXsCv(Q7PYvig-V&R=-E>>Wiq9wxCve3zh01Mpxi5sOS4S{S?Pc
zRB3Whr7XbbumO4AZywW709~1N0w$qS?L)2X5Gs&U_yV3oWoS-+JM{}unP^0<{D-Lf
zUqNN$Flziao$D7-f#1Loo&SH+&;XBGFR(KcjG0TnFCN4uROE33?DL+B+Ck=`K^T
zS22|SebfMtu@gq{kV+7Tx<4CPyeY<~aRcV!6`Y9uhj9Y16364-VdOuH#tkm4#@-Zg
z1HOzT!?; |