From: Christopher Allan Webber
Date: Mon, 27 May 2013 18:55:06 +0000 (-0500)
Subject: Committing extracted and compiled translations
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=cff285b1cbaf3e7a6aec6604fbeac410a5574480;p=mediagoblin.git
Committing extracted and compiled translations
---
diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo
index 5e69858e..543830c8 100644
Binary files a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po
index 51c71c3a..1f086613 100644
--- a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po
@@ -3,18 +3,19 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# Majid Al-Dharrab , 2011.
-# Mena Rezk Eid , 2013.
-# , 2011.
-# , 2011.
+# Jiyda , 2013
+# Majid Al-Dharrab , 2011
+# minaeid90 , 2013
+# OmarKH , 2011
+# OsamaK , 2011
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-05 00:04+0000\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+0000\n"
"Last-Translator: cwebber \n"
-"Language-Team: LANGUAGE \n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/mediagoblin/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -22,34 +23,39 @@ 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:28
-msgid "Invalid User name or email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "اسÙ
اÙÙ
ستخدÙ
"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
msgid "Password"
msgstr "ÙÙÙ
Ø© اÙسر"
-#: mediagoblin/auth/forms.py:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "عÙÙا٠اÙبرÙد اÙØ¥ÙÙترÙÙÙ"
-#: mediagoblin/auth/forms.py:78
-msgid "Username or email"
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
msgstr ""
+#: mediagoblin/auth/forms.py:52
+msgid "Username or email"
+msgstr "اسÙ
اÙÙ
ستخدÙ
ا٠اÙاÙÙ
ÙÙ"
+
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr "اسÙ
Ù
ستخدÙ
ا٠اÙÙ
Ù٠غÙر صØÙØ."
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr "Ùذا اÙØÙÙ Ùا Ùأخذ اÙÙ
ÙÙ."
+
+#: mediagoblin/auth/tools.py:33
+msgid "This field requires an email address."
+msgstr "Ùذا اÙØÙÙ ÙØتاج اÙÙ
ÙÙ."
+
#: mediagoblin/auth/views.py:54
msgid "Sorry, registration is disabled on this instance."
msgstr "عÙÙÙØ§Ø Ø§ÙتسجÙ٠غÙر Ù
ØªØ§Ø ÙÙا."
@@ -60,56 +66,56 @@ msgstr "عذرÙØ§Ø ÙÙد اختار Ù
ستخدÙ
آخر Ùذا اÙاسÙ
."
#: mediagoblin/auth/views.py:72
msgid "Sorry, a user with that email address already exists."
-msgstr ""
+msgstr "عذرÙØ§Ø ÙÙد اختار Ù
ستخدÙ
آخر Ùذا اÙاÙÙ
ÙÙ."
-#: mediagoblin/auth/views.py:174
+#: mediagoblin/auth/views.py:182
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "تÙ
اÙتØÙÙ Ù
٠برÙد٠اÙØ¥ÙÙترÙÙÙ. ÙÙ
ÙÙ٠اÙآ٠اÙÙÙÙØ¬Ø ÙتØرÙر Ù
ÙÙ٠اÙشخصÙØ ÙÙشر اÙصÙر!"
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
msgstr "Ù
ÙØªØ§Ø Ø§ÙتØÙ٠أ٠Ù
عر٠اÙÙ
ستخدÙ
خاطئ"
-#: mediagoblin/auth/views.py:198
+#: mediagoblin/auth/views.py:206
msgid "You must be logged in so we know who to send the email to!"
msgstr "Ùجب عÙÙ٠تسجÙ٠اÙدخÙÙ Ùإرسا٠برÙد اÙÙترÙÙÙ ÙÙ!"
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr "ÙÙد ÙÙ
ت باÙÙع٠باÙتØÙÙ Ù
٠عÙÙا٠اÙبرÙد اÙØ¥ÙÙترÙÙ٠اÙخاص بÙ!"
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "أعدÙا إرسا٠رساÙØ© اÙتØÙÙ."
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
-msgstr ""
+msgstr "إذا Ùا٠Ùذا اÙاÙÙ
ÙÙ(Øساس ÙÙØرÙ٠اÙÙبÙرة ÙاÙصغÙرة!) Ù
ÙسجÙ, ÙÙد تÙ
إرسا٠اÙÙ
Ù٠ب٠تعÙÙÙ
ات ع٠ÙÙÙÙØ© تغÙÙر رÙÙ
٠اÙسرÙ."
-#: mediagoblin/auth/views.py:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
-msgstr ""
+msgstr "ÙÙ
ÙتÙ
ÙÙ Ù
٠اÙعثÙر عÙ٠أØد Ù٠أسÙ
اÙÙ
ستخدÙ
Ùذا."
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
msgid ""
"An email has been sent with instructions on how to change your password."
-msgstr ""
+msgstr "ÙÙد تÙ
إرسا٠اÙÙ
Ù٠ب٠تعÙÙÙ
ات ع٠ÙÙÙÙØ© تغÙÙر رÙÙ
٠اÙسرÙ."
-#: mediagoblin/auth/views.py:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
msgid "You can now log in using your new password."
-msgstr ""
+msgstr "تستطÙع اÙآ٠اÙدخÙ٠باستخداÙ
رÙÙ
٠اÙسر٠اÙجدÙد."
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -120,13 +126,13 @@ msgid "Description of this work"
msgstr "Ùص٠Ùذا اÙعÙ
Ù."
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
" \n"
" Markdown for formatting."
-msgstr ""
+msgstr "باÙ
ÙاÙ٠استخداÙ
â\nâ\nMarkdown ÙÙإدراج."
#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
msgid "Tags"
@@ -134,13 +140,13 @@ msgstr "اÙÙسÙÙ
"
#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
msgid "Separate tags by commas."
-msgstr ""
+msgstr "ÙÙ
بÙص٠اÙÙ
Øددات بÙصÙØ©."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "اÙÙ
سار"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "Ùا ÙÙ
Ù٠تر٠اÙÙ
سار ÙارغÙا"
@@ -148,12 +154,12 @@ msgstr "Ùا ÙÙ
Ù٠تر٠اÙÙ
سار ÙارغÙا"
msgid ""
"The title part of this media's address. You usually don't need to change "
"this."
-msgstr ""
+msgstr "Ù
ÙدÙ
Ø© عÙÙا٠Ùذ٠اÙÙ
ÙدÙا, غاÙبا Ù٠تØتاج ÙتغÙرÙ."
#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
#: mediagoblin/templates/mediagoblin/utils/license.html:20
msgid "License"
-msgstr ""
+msgstr "ترخÙص"
#: mediagoblin/edit/forms.py:50
msgid "Bio"
@@ -165,48 +171,48 @@ msgstr "اÙÙ
ÙÙع اÙØ¥ÙÙترÙÙÙ"
#: mediagoblin/edit/forms.py:58
msgid "This address contains errors"
-msgstr ""
+msgstr "اÙعÙÙا٠ÙØتÙ٠عÙ٠اخطاء"
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:64
-msgid "Enter your old password to prove you own this account."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:67
-msgid "New password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
-msgstr ""
+msgstr "تÙضÙ٠رخصة"
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
-msgstr ""
+msgstr "سÙ٠تÙÙÙ Ùذ٠رخصت٠اÙÙ
بدئÙØ© ÙÙ ÙÙ
اذج اÙتØÙ
ÙÙ."
-#: mediagoblin/edit/forms.py:82
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
-msgstr ""
+msgstr "ارس٠Ù٠رساÙØ© عÙدÙ
ا ÙÙÙÙ
اÙاخرÙ٠باÙتعÙÙ٠عÙ٠اÙÙ
ÙدÙا خاصتÙ"
-#: mediagoblin/edit/forms.py:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
-msgstr ""
+msgstr "Ùا ÙÙ
Ù٠تر٠اÙعÙÙا٠ÙارغÙا"
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
-msgstr ""
+msgstr "Ùص٠Ùذ٠اÙÙ
جÙ
Ùعة"
-#: mediagoblin/edit/forms.py:103
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
-msgstr ""
+msgstr "Ù
ÙدÙ
Ø© عÙÙا٠Ùذ٠اÙÙ
جÙ
Ùعة, غاÙبا Ù٠تØتاج ÙتغÙرÙ."
+
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr " ÙÙÙ
Ø© اÙسر اÙÙدÙÙ
Ø©"
-#: mediagoblin/edit/views.py:66
+#: mediagoblin/edit/forms.py:101
+msgid "Enter your old password to prove you own this account."
+msgstr "ÙÙ
بإدخا٠رÙÙ
٠اÙسر٠اÙÙدÙÙ
Øت٠تثبت اÙ٠صاØب Ùذا اÙØساب."
+
+#: mediagoblin/edit/forms.py:104
+msgid "New password"
+msgstr "رÙÙ
سر٠جدÙد"
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr "ÙÙجد Ù
Ù٠آخر بÙذا اÙÙ
سار Ùد٠Ùذ٠اÙÙ
ستخدÙ
."
@@ -217,11 +223,11 @@ msgstr "Ø£Ùت تØرÙر Ùسائط Ù
ستخدÙ
آخر. ÙÙ ØذرÙا أثÙ
#: mediagoblin/edit/views.py:155
#, python-format
msgid "You added the attachment %s!"
-msgstr ""
+msgstr "ÙÙد ÙÙ
ت بإضاÙØ© Ù
رÙÙØ© %s!"
#: mediagoblin/edit/views.py:182
msgid "You can only edit your own profile."
-msgstr ""
+msgstr "ÙÙ
ÙÙÙ ÙÙØ· تعدÙÙ Øساب٠اÙخاص"
#: mediagoblin/edit/views.py:188
msgid "You are editing a user's profile. Proceed with caution."
@@ -229,44 +235,63 @@ msgstr "Ø£Ùت تØرÙر Ù
ÙÙ Ù
ستخدÙ
آخر. ÙÙ ØذرÙا أثÙاء
#: mediagoblin/edit/views.py:204
msgid "Profile changes saved"
-msgstr ""
+msgstr "تÙ
ØÙظ تغÙرات ØسابÙ"
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr "ÙÙÙ
ة سر خاطئة"
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
-msgstr ""
+msgstr "تÙ
ØÙظ خصائص ØسابÙ"
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
-msgstr ""
+msgstr "Ùجب عÙÙ٠تأÙÙد Ø¥Ùغاء ØسابÙ."
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
-msgstr ""
+msgstr "Ø£Ùت ÙدÙÙ Ù
جÙ
Ùعة تدع٠\"%s\"!"
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
msgid "A collection with that slug already exists for this user."
-msgstr ""
+msgstr "تÙجد Ù
جÙ
Ùعة اخر٠بÙذا اÙÙ
سار ÙÙذا اÙÙ
ستخدÙ
."
-#: mediagoblin/edit/views.py:343
+#: mediagoblin/edit/views.py:329
msgid "You are editing another user's collection. Proceed with caution."
+msgstr "Ø£Ùت تعد٠Ù
جÙ
Ùعة Ù
ستخدÙ
آخر. ÙÙ ØذرÙا أثÙاء اÙعÙ
ÙÙØ©."
+
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr "ÙÙÙ
ة سر خاطئة"
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
-msgstr ""
+msgstr "ÙÙ
ÙتÙ
ربط اÙØ«ÙÙ
... ÙاتÙجد Ù
جÙ
Ùعة Ø«ÙÙ
ات\n"
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
-msgstr ""
+msgstr "Ùا ÙÙجد Ù
سار جÙد ÙÙذا اÙØ«ÙÙ
\n"
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
+msgstr "ÙÙÙÙ, اÙرابط اÙÙدÙÙ
ÙÙÙ
سار اÙذ٠تÙ
اÙجادÙ; ØÙØ°Ù.\n"
+
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
msgstr ""
#: mediagoblin/meddleware/csrf.py:134
@@ -274,55 +299,59 @@ 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 ""
+msgstr "CSRF ÙÙÙÙز غÙر Ù
ÙجÙدة, ÙÙذا Ù
٠اÙÙ
Ù
Ù٠ا٠ÙÙÙÙ ÙتÙجة ÙÙ
اÙع اÙÙÙÙÙز ا٠شئ Ù
Ù Ùذا اÙÙبÙÙ.
تأÙد Ù
٠أÙÙ ÙÙ
ت باÙسÙ
Ø§Ø Ùخصائص اÙÙÙÙÙز ÙÙذا اÙÙ
ÙداÙ."
-#: mediagoblin/media_types/__init__.py:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
+msgstr "عذرا, اÙا Ùا ادعÙ
Ùذا اÙÙÙع Ù
٠اÙÙ
ÙÙات :("
+
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
msgstr ""
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
-msgstr ""
+msgstr "ÙØ´Ù Ù٠تØÙÙ٠اÙÙÙدÙÙ"
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
msgid "Location"
-msgstr ""
+msgstr "اÙÙ
ÙاÙ"
#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
#, python-format
msgid "View on OpenStreetMap"
-msgstr ""
+msgstr "عرض ÙÙ OpenStreetMap"
#: mediagoblin/plugins/oauth/forms.py:29
msgid "Allow"
-msgstr ""
+msgstr "سÙ
اØ"
#: mediagoblin/plugins/oauth/forms.py:30
msgid "Deny"
-msgstr ""
+msgstr "رÙض"
#: mediagoblin/plugins/oauth/forms.py:34
msgid "Name"
-msgstr ""
+msgstr "اÙاسÙ
"
#: mediagoblin/plugins/oauth/forms.py:35
msgid "The name of the OAuth client"
-msgstr ""
+msgstr "اسÙ
اÙعÙ
Ù٠اÙÙ
ÙØ´Ùئ"
#: mediagoblin/plugins/oauth/forms.py:36
msgid "Description"
-msgstr ""
+msgstr "اÙÙصÙ"
#: mediagoblin/plugins/oauth/forms.py:38
msgid ""
"This will be visible to users allowing your\n"
" application to authenticate as them."
-msgstr ""
+msgstr "سÙÙ ÙÙÙÙ Ùذا Ù
رئ٠باÙÙسبة ÙÙÙ
ستخدÙ
ÙÙ Øت٠ÙتاØ\nÙÙبرÙاÙ
ج خاصت٠باÙتصدÙ٠عÙÙÙÙ
."
#: mediagoblin/plugins/oauth/forms.py:40
msgid "Type"
-msgstr ""
+msgstr "اÙÙÙع"
#: mediagoblin/plugins/oauth/forms.py:45
msgid ""
@@ -332,88 +361,88 @@ msgid ""
" Public - The client can't make confidential\n"
" requests to the GNU MediaGoblin instance (e.g. client-side\n"
" JavaScript client)."
-msgstr ""
+msgstr "سر٠- ÙستطÙع اÙعÙ
ÙÙ\nا٠ÙÙÙÙ
بطÙب Ùسخة Ù
Ù GNU MediaGoblin ÙاÙت٠Ù
٠اÙÙ
Ù
Ù٠ا٠\nÙعترض٠ÙÙÙ٠اÙÙ
ستخدÙ
(Ù
Ø«Ùا اÙخادÙ
Ù
٠جاÙب اÙعÙ
ÙÙ).
\nعاÙ
- Ùا ÙستطÙع اÙعÙ
Ù٠ارسا٠طÙبات سرÙØ©\nÙÙسخة Ù
Ù GNU MediaGoblin (Ù
Ø«Ùا \nخادÙ
اÙجاÙا سÙرÙبت Ù
٠جاÙب اÙعÙ
ÙÙ)."
#: mediagoblin/plugins/oauth/forms.py:52
msgid "Redirect URI"
-msgstr ""
+msgstr "تØÙÙÙ ÙÙÙÙ"
#: mediagoblin/plugins/oauth/forms.py:54
msgid ""
"The redirect URI for the applications, this field\n"
" is required for public clients."
-msgstr ""
+msgstr "اÙرابط اÙÙ
Ùج٠ÙÙبرÙاÙ
ج, Ùذا اÙØÙÙ\nÙ
Ø·ÙÙب ÙجÙ
ÙÙر اÙعÙ
Ùاء."
#: mediagoblin/plugins/oauth/forms.py:66
msgid "This field is required for public clients"
-msgstr ""
+msgstr "Ùذا اÙØÙÙ Ù
Ø·ÙÙب ÙجÙ
ÙÙر اÙعÙ
Ùاء"
-#: mediagoblin/plugins/oauth/views.py:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
-msgstr ""
+msgstr "اÙعÙ
ÙÙ {0} تÙ
تسجÙÙÙ!"
#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22
msgid "OAuth client connections"
-msgstr ""
+msgstr "ارتباطات اÙعÙ
Ù٠اÙÙ
Ùشئ"
#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22
msgid "Your OAuth clients"
-msgstr ""
+msgstr "عÙ
ÙÙ٠اÙÙ
Ùشئ"
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
#: 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 ""
+msgstr "اضÙ"
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
-msgstr ""
+msgstr "اÙÙ
Ù٠اÙÙ
عط٠ÙÙذا اÙÙÙع Ù
٠اÙÙ
ÙدÙا غÙر صØÙØ."
#: mediagoblin/submit/forms.py:26
msgid "File"
msgstr "اÙÙ
ÙÙ"
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr "Ùجب أ٠تضع Ù
ÙÙÙا."
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr "Ùا سÙاÙ
! ÙÙشرÙت!"
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
-msgstr ""
+msgstr "تÙ
إضاÙØ© اÙÙ
جÙ
Ùعة \"%s\"!"
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr "تأÙد Ù
٠برÙد٠اÙØ¥ÙÙترÙÙÙ!"
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
-msgstr ""
+msgstr "تسجÙ٠خرÙج"
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
-msgstr ""
+msgstr "%(user_name)s's Øساب"
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
-msgstr ""
+msgstr "تغÙÙر خصائص اÙØساب"
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -421,79 +450,32 @@ msgstr ""
msgid "Media processing panel"
msgstr "ÙÙØØ© Ù
عاÙجة اÙÙسائط"
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
-msgstr ""
+msgstr "تسجÙ٠خرÙج"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "أض٠Ùسائط"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr ""
+msgstr "Ø¥Ùشاء Ù
جÙ
Ùعة جدÙدة"
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr "استÙØ´Ù"
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
-msgstr ""
+msgstr "صÙرة ÙزÙ
Ù
رتبÙ"
-#: mediagoblin/templates/mediagoblin/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr "Ø£Øدث اÙÙسائط"
#: mediagoblin/templates/mediagoblin/admin/panel.html:29
msgid ""
"Here you can track the state of media being processed on this instance."
-msgstr ""
+msgstr "ÙÙ
ÙÙÙ Ù
تابعة عÙ
ÙÙØ© Ù
عاÙجة Ùسائط Ù
عرض٠Ù
Ù ÙÙا."
#: mediagoblin/templates/mediagoblin/admin/panel.html:32
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
@@ -513,34 +495,34 @@ msgstr "ÙØ´Ùت Ù
عاÙجة Ùذ٠اÙÙ
ÙÙات:"
#: mediagoblin/templates/mediagoblin/admin/panel.html:90
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
msgid "No failed entries!"
-msgstr ""
+msgstr "Ùا تÙجد Ù
داخ٠ÙاشÙØ©!"
#: mediagoblin/templates/mediagoblin/admin/panel.html:92
msgid "Last 10 successful uploads"
-msgstr ""
+msgstr "آخر 10 تØÙÙÙات ÙاجØØ©"
#: mediagoblin/templates/mediagoblin/admin/panel.html:112
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
msgid "No processed entries, yet!"
-msgstr ""
+msgstr "Ùا ÙÙجد Ù
داخ٠Ù
ÙعاÙجة بعد! "
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
msgid "Set your new password"
-msgstr ""
+msgstr "ÙÙ
بضبط رÙÙ
٠اÙسر٠اÙجدÙد"
#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39
msgid "Set password"
-msgstr ""
+msgstr "ÙÙ
بضبط رÙÙ
سرÙ"
#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23
#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31
msgid "Recover password"
-msgstr ""
+msgstr "استعادة ÙÙÙ
Ø© اÙسر"
#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34
msgid "Send instructions"
-msgstr ""
+msgstr "ارس٠تعÙÙÙ
ات"
#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19
#, python-format
@@ -592,6 +574,53 @@ msgid ""
"%(verification_url)s"
msgstr "Ø£ÙÙÙا Ùا %(username)sØ\n\nاÙØªØ Ø§Ùرابط اÙتاÙÙ\nÙÙ Ù
تصÙØÙ ÙتÙعÙÙ Øساب٠Ù٠غÙÙ Ù
ÙدÙاغÙبÙÙ:\n\n%(verification_url)s"
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr "برعاÙØ© MediaGoblin, a GNU Ù
شرÙع."
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr "تÙ
اÙÙشر ÙÙÙا Ù AGPL. Source code Ù
تاØ."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr "استÙØ´Ù"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "اÙÙا, Ù
رØبا ب٠ÙÙ Ù
ÙÙع MediaGoblin."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr "Ùذا اÙÙ
ÙÙع ÙÙÙÙ
بتشغÙÙ MediaGoblin, ÙÙ٠برÙاÙ
ج استضاÙØ© Ù
ÙدÙا Ùائ٠اÙرÙعة."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+msgid "Don't have one yet? It's easy!"
+msgstr "ÙÙس ÙدÙÙ ÙاØد Øت٠اÙØ¢ÙØ Ø§Ù٠سÙÙ!"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
+#, python-format
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -601,18 +630,18 @@ msgstr "شعار Ù
ÙدÙاغÙبÙÙ"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:35
#, python-format
msgid "Editing attachments for %(media_title)s"
-msgstr ""
+msgstr "تعدÙ٠اÙÙ
رÙÙات Ù %(media_title)s"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
-msgstr ""
+msgstr "Ù
رÙÙات"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
-msgstr ""
+msgstr "أض٠Ù
رÙÙØ©"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:61
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:42
@@ -627,26 +656,36 @@ msgstr "Ø£ÙغÙ"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
-msgstr ""
+msgstr "Ù٠ترÙد ÙعÙا Ø¥Ùغاء اÙÙ
ستخدÙ
'%(user_name)s' ÙÙ٠اÙÙ
ÙدÙا/اÙتعÙÙÙات اÙÙ
تعÙÙØ© بÙØ"
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35
msgid "Yes, really delete my account"
-msgstr ""
+msgstr "ÙعÙ
, ÙÙ
بإÙغاء ØسابÙ"
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
-msgstr ""
+msgstr "اØØ°Ù ÙÙائÙÙا"
#: mediagoblin/templates/mediagoblin/edit/edit.html:23
#: mediagoblin/templates/mediagoblin/edit/edit.html:35
@@ -658,11 +697,15 @@ msgstr "تØرÙر %(media_title)s"
#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
#, python-format
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:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
-msgstr ""
+msgstr "Ø¥Ùغ٠ØسابÙ"
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
@@ -681,42 +724,45 @@ msgstr "تØرÙر Ù
ÙÙ %(username)s اÙشخصÙ"
#: mediagoblin/templates/mediagoblin/listings/tag.html:35
#, python-format
msgid "Media tagged with: %(tag_name)s"
-msgstr ""
+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/video.html:55
msgid "Download"
-msgstr ""
+msgstr "تØÙ
ÙÙ"
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
msgid "Original"
-msgstr ""
+msgstr "أصÙÙ"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
msgid ""
"Sorry, this audio will not work because \n"
"\tyour web browser does not support HTML5 \n"
"\taudio."
-msgstr ""
+msgstr "عذرا, ÙÙ ÙتÙ
تشغÙ٠اÙصÙت ÙØ£Ù â\n»Ù
تصÙØÙ Ùا ÙدعÙ
HTML5 â\n»صÙتÙا."
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
msgid ""
"You can get a modern web browser that \n"
"\tcan play the audio at \n"
"\t http://getfirefox.com!"
-msgstr ""
+msgstr "تستطÙع اÙØصÙ٠عÙÙ Ù
تصÙØ ØدÙØ« â\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/video.html:61
msgid "Original file"
-msgstr ""
+msgstr "Ù
Ù٠أصÙÙ"
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
msgid "WebM file (Vorbis codec)"
-msgstr ""
+msgstr "Ù
ÙÙ WebM (Vorbic ÙÙدÙÙ)"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -725,65 +771,69 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media.html:65
#, python-format
msgid "Image for %(media_title)s"
+msgstr "صÙرة Ù%(media_title)s"
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+msgid "PDF file"
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
-msgstr ""
+msgstr "تبدÙ٠اÙتدÙÙر"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
-msgstr ""
+msgstr "Ù
ÙظÙر"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
msgid "Front"
-msgstr ""
+msgstr "Ù
ÙدÙ
Ø©"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Top"
-msgstr ""
+msgstr "أعÙÙ"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
msgid "Side"
-msgstr ""
+msgstr "جاÙب"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
msgid "WebGL"
-msgstr ""
+msgstr "WebGL"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
msgid "Download model"
-msgstr ""
+msgstr "تØÙ
ÙÙ ÙÙ
Ùذج"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
msgid "File Format"
-msgstr ""
+msgstr "بÙÙØ© اÙÙ
ÙÙ"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
msgid "Object Height"
-msgstr ""
+msgstr "Ø·Ù٠اÙÙائÙ"
#: mediagoblin/templates/mediagoblin/media_displays/video.html:44
msgid ""
"Sorry, this video will not work because\n"
" your web browser does not support HTML5 \n"
" video."
-msgstr ""
+msgstr "عذرا, ÙÙ ÙتÙ
تشغÙÙ Ùذا اÙÙÙدÙÙ ÙØ£Ù â\n»Ù
تصÙØÙ Ùا ÙدعÙ
HTML5 â\n»ÙÙدÙÙ."
#: 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 ""
+msgstr "تستطÙع اÙØصÙ٠عÙÙ Ù
تصÙØ ØدÙØ« â\n»ÙÙ
ÙÙ٠تشغÙÙ Ùذا اÙÙÙدÙÙ ÙÙ â\n» http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
msgid "WebM file (640p; VP8/Vorbis)"
-msgstr ""
+msgstr "WebM Ù
ÙÙ (640p; VP8/Vorbis)"
#: mediagoblin/templates/mediagoblin/submit/collection.html:26
msgid "Add a collection"
@@ -792,27 +842,27 @@ msgstr "إضاÙØ© Ù
جÙ
Ùعة"
#: mediagoblin/templates/mediagoblin/submit/start.html:23
#: mediagoblin/templates/mediagoblin/submit/start.html:30
msgid "Add your media"
-msgstr ""
+msgstr "اض٠اÙÙ
ÙدÙا اÙخاصة بÙ"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
#, python-format
msgid "%(collection_title)s (%(username)s's collection)"
-msgstr ""
+msgstr "%(collection_title)s (%(username)s's Ù
جÙ
Ùعة)"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
#, python-format
msgid "%(collection_title)s by %(username)s"
-msgstr ""
+msgstr "%(collection_title)s بÙاسطة %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
#: mediagoblin/templates/mediagoblin/user_pages/media.html:79
msgid "Edit"
-msgstr ""
+msgstr "تعدÙÙ"
#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
msgid "Delete"
-msgstr ""
+msgstr "Ø¥Ùغاء"
#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -823,40 +873,40 @@ msgstr "أتÙد ØÙÙا ØØ°Ù %(title)s?"
#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
#, python-format
msgid "Really remove %(media_title)s from %(collection_title)s?"
-msgstr ""
+msgstr "Ù٠ترÙد ÙعÙا Ø¥Ùغاء %(media_title)s Ù
Ù %(collection_title)s?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
-msgstr ""
+msgstr "Ø¥Ùغاء"
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21
#, python-format
msgid "%(username)s's collections"
-msgstr ""
+msgstr "%(username)s's Ù
جÙ
Ùعات"
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28
#, python-format
msgid "%(username)s's collections"
-msgstr ""
+msgstr "%(username)s's Ù
جÙ
Ùعات"
#: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
#, python-format
msgid ""
"Hi %(username)s,\n"
"%(comment_author)s commented on your post (%(comment_url)s) at %(instance_name)s\n"
-msgstr ""
+msgstr "اÙÙا, %(username)s,\n%(comment_author)s ÙاÙ
باÙتعÙÙ٠عÙÙ Ù
شارÙت٠(%(comment_url)s) ÙÙ %(instance_name)s\n"
#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
#, python-format
msgid "%(username)s's media"
-msgstr ""
+msgstr "%(username)s Ù
ÙدÙا"
#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38
#, python-format
msgid ""
"%(username)s's media with tag %(tag)s"
-msgstr ""
+msgstr "\n%(username)s\n\n's Ù
ÙدÙا باÙÙ
Øدد\n\n%(tag)s\n"
#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48
#, python-format
@@ -866,40 +916,44 @@ msgstr "Ùسائط %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
#, python-format
msgid "â Browsing media by %(username)s"
-msgstr ""
+msgstr "â اختÙار اÙÙ
ÙدÙا بÙاسطة %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
-msgstr ""
+msgstr "أض٠تعÙÙÙ"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
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 ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+msgid "Added"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
-#, python-format
-msgid ""
-"Added on
\n"
-" %(date)s
"
+#: 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
msgid "Add â%(media_title)sâ to a collection"
-msgstr ""
+msgstr "إضاÙØ© â%(media_title)sâ ÙÙ
جÙ
Ùعة"
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54
msgid "+"
-msgstr ""
+msgstr "+"
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58
msgid "Add a new collection"
-msgstr ""
+msgstr "إضاÙØ© Ù
جÙ
Ùعة جدÙدة"
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
msgid ""
@@ -908,7 +962,7 @@ msgstr "ÙÙ
ÙÙÙ Ù
تابعة عÙ
ÙÙØ© Ù
عاÙجة Ùسائط Ù
عرض٠Ù
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
msgid "Your last 10 successful uploads"
-msgstr ""
+msgstr "آخر 10 تØÙ
ÙÙات ÙاجØØ© خاصة بÙ"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:31
#: mediagoblin/templates/mediagoblin/user_pages/user.html:89
@@ -970,7 +1024,7 @@ msgstr "ÙÙ
Ùعبئ Ùذا اÙعض٠بÙاÙات Ù
ÙÙ٠بعد."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:124
msgid "Browse collections"
-msgstr ""
+msgstr "تØدÙد Ù
جÙ
Ùعة"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:137
#, python-format
@@ -991,59 +1045,59 @@ msgstr "Ùا Ùبد٠أÙ٠تÙجد Ø£Ù Ùسائط ÙÙا Øت٠اÙØ¢Ù..."
#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49
msgid "(remove)"
-msgstr ""
+msgstr "(Ø¥Ùغاء)"
#: mediagoblin/templates/mediagoblin/utils/collections.html:21
msgid "Collected in"
-msgstr ""
+msgstr "تÙ
تجÙ
Ùع٠ÙÙ"
#: mediagoblin/templates/mediagoblin/utils/collections.html:40
msgid "Add to a collection"
-msgstr ""
+msgstr "إضاÙØ© Ù
جÙ
Ùعة"
#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
msgid "feed icon"
-msgstr ""
+msgstr "اÙÙÙÙØ© تغذÙØ©"
#: mediagoblin/templates/mediagoblin/utils/feed_link.html:23
#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23
msgid "Atom feed"
-msgstr ""
+msgstr "تغذÙØ© ذرÙØ©"
#: mediagoblin/templates/mediagoblin/utils/license.html:25
msgid "All rights reserved"
-msgstr ""
+msgstr "جÙ
Ùع اÙØÙÙÙ Ù
ØÙÙظة"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:39
msgid "â Newer"
-msgstr ""
+msgstr "اجددâ"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:45
msgid "Older â"
-msgstr ""
+msgstr "âاÙدÙ
"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:48
msgid "Go to page:"
-msgstr ""
+msgstr "اذÙب Ø¥Ù٠صÙØØ©:"
#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
msgid "newer"
-msgstr ""
+msgstr "اجدد"
#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
msgid "older"
-msgstr ""
+msgstr "اÙدÙ
"
#: mediagoblin/templates/mediagoblin/utils/tags.html:20
msgid "Tagged with"
-msgstr ""
+msgstr "تØدد ب"
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
-msgstr ""
+msgstr "ÙÙ
ÙستطÙع Ùراءة Ùذ٠اÙصÙرة."
#: mediagoblin/tools/response.py:35
msgid "Oops!"
@@ -1051,36 +1105,60 @@ msgstr "ÙÙØÙ!"
#: mediagoblin/tools/response.py:36
msgid "An error occured"
-msgstr ""
+msgstr "Øدث خطأ"
#: mediagoblin/tools/response.py:51
msgid "Operation not allowed"
-msgstr ""
+msgstr "غÙر Ù
سÙ
ÙØ Ø¨Ùذ٠اÙعÙ
ÙÙØ©"
#: mediagoblin/tools/response.py:52
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 ""
+msgstr "عذرا دÙÙ, Ùا استطÙع تر٠تÙع٠Ùذا!
ÙÙد ØاÙÙت تشغÙ٠خاصÙØ© ÙÙست Ù
سÙ
ÙØØ© ÙÙ. ÙÙ ÙÙت تØاÙ٠إÙغاء جÙ
Ùع Øسابات اÙÙ
ستخدÙ
ÙÙ Ù
جدداØ"
#: mediagoblin/tools/response.py:60
msgid ""
"There doesn't seem to be a page at this address. Sorry!
If you're sure"
" the address is correct, maybe the page you're looking for has been moved or"
" deleted."
+msgstr "Ùبد٠أÙÙ Ùا تÙجد صÙØØ© بÙذا اÙعÙÙاÙ, عذرا
إذا ÙÙت Ù
تأÙد Ù
٠صØØ© اÙعÙÙاÙ, Ù
٠اÙÙ
Ù
Ù٠أ٠تÙÙ٠اÙصÙØØ© اÙت٠تبØØ« عÙÙا Ùد تÙ
ÙÙÙÙا أ٠إÙغاءÙا."
+
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
msgstr ""
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
-msgstr ""
+msgstr "تعÙÙÙ"
#: mediagoblin/user_pages/forms.py:25
msgid ""
"You can use Markdown for"
" formatting."
-msgstr ""
+msgstr "باÙ
ÙاÙ٠استخداÙ
Markdown ÙÙإدراج."
#: mediagoblin/user_pages/forms.py:31
msgid "I am sure I want to delete this"
@@ -1088,87 +1166,91 @@ msgstr "Ø£Ùا Ù
تأÙد Ù
٠رغبت٠بØØ°Ù Ùذا اÙعÙ
Ù"
#: mediagoblin/user_pages/forms.py:35
msgid "I am sure I want to remove this item from the collection"
-msgstr ""
+msgstr "Ø£Ùا Ù
تأÙد Ù
٠أÙÙ٠أرÙد Ø¥Ùغاء Ùذ٠اÙÙ
ادة Ù
٠اÙÙ
جÙ
Ùعة"
#: mediagoblin/user_pages/forms.py:39
msgid "Collection"
-msgstr ""
+msgstr "Ù
جÙ
Ùعة"
#: mediagoblin/user_pages/forms.py:40
msgid "-- Select --"
-msgstr ""
+msgstr "-- إختار --"
#: mediagoblin/user_pages/forms.py:42
msgid "Include a note"
-msgstr ""
+msgstr "إدراج Ù
ÙاØظة"
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
+msgstr "ÙاÙ
باÙتعÙÙ٠عÙÙ Ù
شارÙتÙ"
+
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
msgstr ""
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
-msgstr ""
+msgstr "عذرا, ÙÙد ÙÙ
ت بادخا٠تعÙÙÙ Ùارغ."
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
-msgstr ""
+msgstr "ÙÙد تÙ
إرسا٠تعÙÙÙÙ!"
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
-msgstr ""
+msgstr "Ù
Ù ÙضÙÙ ÙÙ
بÙØص اÙÙ
داخ٠ÙÙÙ
باÙÙ
ØاÙÙØ© Ù
رة أخرÙ."
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
-msgstr ""
+msgstr "Ùجب عÙÙ٠إختÙار أ٠إضاÙØ© Ù
جÙ
Ùعة"
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
-msgstr ""
+msgstr "\"%s\" تÙجد باÙÙع٠Ù٠اÙÙ
جÙ
Ùعة \"%s\""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
-msgstr ""
+msgstr "\"%s\" Ø£ÙضÙÙت ÙÙÙ
جÙ
Ùعة \"%s\""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
-msgstr ""
+msgstr "ÙÙد ÙÙ
ت بإÙغاء اÙÙ
ÙدÙا."
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
msgid "The media was not deleted because you didn't check that you were sure."
-msgstr ""
+msgstr "ÙÙ
ÙتÙ
Ø¥Ùغاء اÙÙ
ÙدÙا ÙØ£ÙÙ ÙÙ
تÙÙ
بإختÙار اÙÙ Ù
تأÙد Ù
Ù Ø°ÙÙ."
-#: mediagoblin/user_pages/views.py:301
+#: mediagoblin/user_pages/views.py:296
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "Ø£Ùت عÙÙ ÙØ´Ù ØØ°Ù Ùسائط Ù
ستخدÙ
آخر. ÙÙ ØذرÙا أثÙاء اÙعÙ
ÙÙØ©."
-#: mediagoblin/user_pages/views.py:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
-msgstr ""
+msgstr "ÙÙد ÙÙ
ت بإÙغاء اÙÙ
ادة Ù
٠اÙÙ
جÙ
Ùعة."
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
msgid "The item was not removed because you didn't check that you were sure."
-msgstr ""
+msgstr "ÙÙ
ÙتÙ
Ø¥Ùغاء اÙÙ
ادة ÙØ£ÙÙ ÙÙ
تÙÙ
بإختÙار اÙÙ Ù
تأÙد Ù
Ù Ø°ÙÙ."
-#: mediagoblin/user_pages/views.py:389
+#: mediagoblin/user_pages/views.py:382
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
-msgstr ""
+msgstr "Ø£Ùت عÙÙ ÙØ´Ù ØØ°Ù Ù
ادة Ù
Ù Ù
جÙ
Ùعة Ù
ستخدÙ
آخر. ÙÙ Øذرا."
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
-msgstr ""
+msgstr "ÙÙد ÙÙ
ت بإÙغاء اÙÙ
جÙ
Ùعة \"%s\""
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
msgid ""
"The collection was not deleted because you didn't check that you were sure."
-msgstr ""
+msgstr "ÙÙ
ÙتÙ
Ø¥Ùغاء اÙÙ
جÙ
Ùعة ÙØ£ÙÙ ÙÙ
تÙÙ
بإختÙار اÙÙ Ù
تأÙد Ù
Ù Ø°ÙÙ."
-#: mediagoblin/user_pages/views.py:439
+#: mediagoblin/user_pages/views.py:430
msgid ""
"You are about to delete another user's collection. Proceed with caution."
-msgstr ""
+msgstr "Ø£Ùت عÙÙ ÙØ´Ù ØØ°Ù Ù
جÙ
Ùعة Ù
ستخدÙ
آخر. ÙÙ Øذرا."
diff --git a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo
index 495ef726..ec01d7f7 100644
Binary files a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po
index 28bdca82..9ebbdf18 100644
--- a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po
@@ -3,17 +3,17 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# Al fred , 2011.
-# , 2011.
-# , 2012.
+# Al fred , 2011
+# Al fred , 2011
+# skarbat , 2012
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-05 00:04+0000\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+0000\n"
"Last-Translator: cwebber \n"
-"Language-Team: LANGUAGE \n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/mediagoblin/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -21,34 +21,39 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "Nom d'usuari"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
msgid "Password"
msgstr "Contrasenya"
-#: mediagoblin/auth/forms.py:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "Adreça electrònica"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr "Nom d'usuari o correu"
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:33
+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."
@@ -61,54 +66,54 @@ msgstr "Lamentablement aquest usuari ja existeix."
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:174
+#: mediagoblin/auth/views.py:182
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:180
+#: mediagoblin/auth/views.py:188
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:198
+#: mediagoblin/auth/views.py:206
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:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr "Ja has verificat la teva adreça de correu!"
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "Torna'm a enviar el correu de verificació"
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
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:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
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:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -119,7 +124,7 @@ msgid "Description of this work"
msgstr "Descripció d'aquest treball."
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -135,11 +140,11 @@ msgstr "Etiquetes"
msgid "Separate tags by commas."
msgstr "Separa els tags amb comes."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Llimac"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "El llimac no pot ésser buit"
@@ -167,45 +172,45 @@ msgid "This address contains errors"
msgstr "Aquesta adreça conté errors"
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr "Contrasenya antiga"
-
-#: mediagoblin/edit/forms.py:64
-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:67
-msgid "New password"
-msgstr "Nova contrasenya"
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:82
+#: 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:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr "El tÃtol no pot ser buit"
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 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:103
+#: mediagoblin/edit/forms.py:92
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/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr "Contrasenya antiga"
+
+#: mediagoblin/edit/forms.py:101
+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
+msgid "New password"
+msgstr "Nova contrasenya"
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr "Ja existeix una entrada amb aquest llimac per aquest usuari"
@@ -230,44 +235,63 @@ msgstr "Esteu editant el perfil d'un usuari. Aneu amb compte"
msgid "Profile changes saved"
msgstr "Els canvis al perfil s'han guardat"
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr "Contrasenya errònia"
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr "Els detalls del compte s'han guardat"
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Ja tens una col.lecció anomenada \"%s\"!"
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:343
+#: mediagoblin/edit/views.py:329
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/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr "Contrasenya errònia"
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+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"
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr "Tot i aixÃ, l'enllaç antic al directori s'ha trobat; eliminat.\n"
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
@@ -275,12 +299,16 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr "Ho sento, no puc manegar aquest tipus d'arxiu :("
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr "La transformació del vÃdeo ha fallat"
@@ -347,7 +375,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:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr "El client {0} ha sigut enregistrat!"
@@ -366,7 +394,7 @@ msgstr ""
msgid "Add"
msgstr "Afegir"
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr "Aquest tipus de fitxer no és và lid."
@@ -374,45 +402,45 @@ msgstr "Aquest tipus de fitxer no és và lid."
msgid "File"
msgstr "Fitxer"
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr "Heu d'escollir un fitxer."
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr "Visca! S'ha enviat!"
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr "S'ha afegit la col.leccio \"%s\"!"
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr "Verifica el teu correu electrònic"
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr "Modificar els ajustaments del compte"
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -420,72 +448,25 @@ msgstr "Modificar els ajustaments del compte"
msgid "Media processing panel"
msgstr "Quadre de processament de fitxers"
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Tots els fitxers"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr "Alliberat segons la AGPL. Codi font disponible."
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr "Explorar"
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "Hola, una benvinguda al MediaGoblin!"
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr "El lloc esta usant MediaGoblin, una gran i extraordinà ria peça de software per allotjar mitjans."
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-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/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr "No en tens una encara? Es fà cil!"
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "Crear un compte a aquest lloc \no\n Preparar MediaGoblin al teu propi servidor"
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr "Mitjans més recents"
@@ -591,6 +572,53 @@ msgid ""
"%(verification_url)s"
msgstr "Hi %(username)s,\n\nto activate your GNU MediaGoblin account, open the following URL in\nyour web browser:\n\n%(verification_url)s"
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr "Alliberat segons la AGPL. Codi font disponible."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr "Explorar"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "Hola, una benvinguda al MediaGoblin!"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr "El lloc esta usant MediaGoblin, una gran i extraordinà ria peça de software per allotjar mitjans."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+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
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -603,13 +631,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:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr ""
@@ -626,12 +654,22 @@ msgstr "Cancel·la"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -642,7 +680,7 @@ msgid "Yes, really delete my account"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "Esborrar permanentment"
@@ -659,7 +697,11 @@ 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:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr ""
@@ -684,6 +726,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/video.html:55
msgid "Download"
@@ -708,6 +751,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/video.html:61
msgid "Original file"
msgstr "Arxiu original"
@@ -716,6 +760,7 @@ msgstr "Arxiu original"
msgid "WebM file (Vorbis codec)"
msgstr "Arxiu WebM (Vorbis codec)"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -726,6 +771,10 @@ 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
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr ""
@@ -824,7 +873,7 @@ msgstr "Realment vols esborrar %(title)s?"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr "Relment eliminar %(media_title)s de %(collection_title)s?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr "Eliminar"
@@ -867,24 +916,28 @@ 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:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr "Afegeix un comentari"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr "Afegir aquest comentari"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
-msgstr "a"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
+#: 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 ""
-"Added on
\n"
-" %(date)s
"
-msgstr "Afegit el
\n %(date)s
"
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+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
@@ -1040,7 +1093,7 @@ msgstr "més antic"
msgid "Tagged with"
msgstr ""
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr "No s'ha pogut llegir l'arxiu d'imatge"
@@ -1070,6 +1123,30 @@ msgid ""
" deleted."
msgstr ""
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr ""
@@ -1101,73 +1178,77 @@ msgstr "-- Sel.leccionar --"
msgid "Include a note"
msgstr "Incluir una nota"
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr "comentat al teu post"
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr "Uups, el teu comentari era buit."
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr "El teu comentari s'ha publicat!"
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
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:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr "Has de sel.leccionar o afegir una col.lecció"
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "\"%s\" ja és a la col.lecció \"%s\""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "\"%s\" afegir a la col.lecció \"%s\""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr "Has esborrat el mitjà "
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
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:301
+#: mediagoblin/user_pages/views.py:296
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:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr "Has esborrat l'element de la col.lecció"
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
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:389
+#: mediagoblin/user_pages/views.py:382
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:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "Has esborrat la col.lecció \"%s\""
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
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:439
+#: mediagoblin/user_pages/views.py:430
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 6b6827f0..53e3fedf 100644
Binary files a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po
index 8494aa60..c78c08ac 100644
--- a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po
@@ -3,17 +3,17 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# Morten Juhl-Johansen Zölde-Fejér , 2012.
-# Olle Jonsson , 2012.
-# Tanja Trudslev , 2012.
+# Morten Juhl-Johansen Zölde-Fejér , 2012
+# Olle Jonsson , 2012
+# ttrudslev , 2012
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-05 00:04+0000\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+0000\n"
"Last-Translator: cwebber \n"
-"Language-Team: LANGUAGE \n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/mediagoblin/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -21,34 +21,39 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "Brugernavn"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
msgid "Password"
msgstr "Kodeord"
-#: mediagoblin/auth/forms.py:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "Email adresse"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr "Brugernavn eller email"
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:33
+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"
@@ -61,54 +66,54 @@ msgstr "Desværre, det brugernavn er allerede brugt"
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:174
+#: mediagoblin/auth/views.py:182
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:180
+#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
msgstr "Bekræftelsesnøglen eller brugerid er forkert"
-#: mediagoblin/auth/views.py:198
+#: mediagoblin/auth/views.py:206
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:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr "Du har allerede bekræftet din email adresse!"
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "Email til godkendelse sendt igen."
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
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:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
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:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -119,7 +124,7 @@ msgid "Description of this work"
msgstr "Beskrivelse af arbejdet"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -135,11 +140,11 @@ msgstr "Tags"
msgid "Separate tags by commas."
msgstr "Separer tags med kommaer."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr ""
@@ -167,45 +172,45 @@ msgid "This address contains errors"
msgstr "Denne adresse indeholder fejl"
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr "Gammelt kodeord"
-
-#: mediagoblin/edit/forms.py:64
-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:67
-msgid "New password"
-msgstr "Ny kodeord"
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:82
+#: 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:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr "Titlen kan ikke være tom"
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 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:103
+#: mediagoblin/edit/forms.py:92
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/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr "Gammelt kodeord"
+
+#: mediagoblin/edit/forms.py:101
+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
+msgid "New password"
+msgstr "Ny kodeord"
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr ""
@@ -230,44 +235,63 @@ msgstr "Du er ved at ændre en bruger's profil. Pas på."
msgid "Profile changes saved"
msgstr "Profilændringer gemt"
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr "Forkert kodeord"
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr "Kontoindstillinger gemt"
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Du har allerede en samling ved navn \"%s\"!"
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:343
+#: mediagoblin/edit/views.py:329
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/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr "Forkert kodeord"
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+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"
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr ""
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
@@ -275,12 +299,16 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr "Desværre, jeg understøtter ikke den filtype :("
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr ""
@@ -347,7 +375,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr "Dette felt er nødvendigt for offentlige klienter"
-#: mediagoblin/plugins/oauth/views.py:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr "Klienten {0} er blevet registreret!"
@@ -366,7 +394,7 @@ msgstr ""
msgid "Add"
msgstr ""
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr "Forkert fil for medietypen."
@@ -374,45 +402,45 @@ msgstr "Forkert fil for medietypen."
msgid "File"
msgstr "Fil"
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr "Du må give mig en fil"
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr "Juhuu! Delt!"
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr "Bekræft din email!"
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -420,72 +448,25 @@ msgstr ""
msgid "Media processing panel"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr "Udforsk"
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "Hey, velkommen til denne MediaGoblin side!"
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-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/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr "Har du ikke en endnu? Det er let!"
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr ""
@@ -591,6 +572,53 @@ msgid ""
"%(verification_url)s"
msgstr ""
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr "Udforsk"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "Hey, velkommen til denne MediaGoblin side!"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+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
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -603,13 +631,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr ""
@@ -626,12 +654,22 @@ msgstr "Afbryd"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -642,7 +680,7 @@ msgid "Yes, really delete my account"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr ""
@@ -659,7 +697,11 @@ msgstr ""
msgid "Changing %(username)s's account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr ""
@@ -684,6 +726,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/video.html:55
msgid "Download"
@@ -708,6 +751,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr ""
@@ -716,6 +760,7 @@ msgstr ""
msgid "WebM file (Vorbis codec)"
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
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -726,6 +771,10 @@ msgstr ""
msgid "Image for %(media_title)s"
msgstr ""
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr ""
@@ -824,7 +873,7 @@ msgstr ""
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr ""
@@ -867,23 +916,27 @@ msgstr ""
msgid "â Browsing media by %(username)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
+#: 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 ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
-#, python-format
-msgid ""
-"Added on
\n"
-" %(date)s
"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+msgid "Added"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
+msgid "Created"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
@@ -1040,7 +1093,7 @@ msgstr ""
msgid "Tagged with"
msgstr ""
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr ""
@@ -1070,6 +1123,30 @@ msgid ""
" deleted."
msgstr ""
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr ""
@@ -1101,73 +1178,77 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr ""
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr ""
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr ""
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr ""
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
msgid "The media was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:301
+#: mediagoblin/user_pages/views.py:296
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:389
+#: mediagoblin/user_pages/views.py:382
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:439
+#: mediagoblin/user_pages/views.py:430
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 5ae794fa..a07400ae 100644
Binary files a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
index b3d82ee9..4bde0095 100644
--- a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
@@ -3,27 +3,27 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# , 2011.
-# , 2011.
-# Elrond , 2011-2012.
-# Elrond , 2013.
-# , 2011, 2012.
-# Jakob Kramer , 2012-2013.
-# Jan-Christoph Borchardt , 2011.
-# Jan-Christoph Borchardt , 2011, 2012.
-# , 2011.
-# , 2011.
-# Rafael Maguiña , 2011.
-# , 2012.
-# Vinzenz Vietzke , 2012.
-# Vinzenz Vietzke , 2011.
+# piratenpanda , 2011
+# cwebber , 2011
+# Elrond , 2011-2012
+# Elrond , 2013
+# Jakob Kramer , 2011, 2012
+# Jakob Kramer , 2012-2013
+# Jan-Christoph Borchardt , 2011
+# Jan-Christoph Borchardt , 2011, 2012
+# Keyzo , 2011
+# Elrond , 2011
+# Art O. Pal , 2011
+# spaetz , 2012
+# Vinzenz Vietzke , 2012
+# Vinzenz Vietzke , 2011
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-07 13:16+0000\n"
-"Last-Translator: Elrond \n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+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,34 +32,39 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
-msgstr "Ungültiger Benutzername oder E-Mail-Adresse."
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr "Dieses Feld akzeptiert keine E-Mail-Adressen."
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr "Dieses Feld benötigt eine E-Mail-Adresse."
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "Benutzername"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
msgid "Password"
msgstr "Passwort"
-#: mediagoblin/auth/forms.py:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "E-Mail-Adresse"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr "Benutzername oder E-Mail-Adresse"
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr "Ungültiger Benutzername oder E-Mail-Adresse."
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr "Dieses Feld akzeptiert keine E-Mail-Adressen."
+
+#: mediagoblin/auth/tools.py:33
+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."
@@ -72,54 +77,54 @@ msgstr "Leider gibt es bereits einen Benutzer mit diesem Namen."
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:174
+#: mediagoblin/auth/views.py:182
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:180
+#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
msgstr "Der Aktivierungsschlüssel oder die Nutzerkennung ist falsch."
-#: mediagoblin/auth/views.py:198
+#: mediagoblin/auth/views.py:206
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:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr "Deine E-Mail-Adresse wurde bereits aktiviert."
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "Aktivierungsmail wurde erneut versandt."
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
msgstr "Es konnte niemand mit diesem Benutzernamen gefunden werden."
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
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:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
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:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -130,7 +135,7 @@ msgid "Description of this work"
msgstr "Beschreibung des Werkes"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -146,11 +151,11 @@ msgstr "Schlagwörter"
msgid "Separate tags by commas."
msgstr "Kommaseparierte Schlagwörter"
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Kurztitel"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "Bitte gib einen Kurztitel ein"
@@ -178,45 +183,45 @@ msgid "This address contains errors"
msgstr "Diese Adresse ist fehlerhaft"
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr "Altes Passwort"
-
-#: mediagoblin/edit/forms.py:64
-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:67
-msgid "New password"
-msgstr "Neues Passwort"
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr "Bevorzugte Lizenz"
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
msgstr "Dies wird Deine Standardlizenz in den Upload-Forumularen sein."
-#: mediagoblin/edit/forms.py:82
+#: 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:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr "Der Titel kann nicht leer sein"
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "Beschreibung dieser Sammlung"
-#: mediagoblin/edit/forms.py:103
+#: mediagoblin/edit/forms.py:92
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/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr "Altes Passwort"
+
+#: mediagoblin/edit/forms.py:101
+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
+msgid "New password"
+msgstr "Neues Passwort"
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr "Diesen Kurztitel hast du bereits vergeben."
@@ -241,44 +246,63 @@ msgstr "Du bearbeitest das Profil eines anderen Nutzers. Sei bitte vorsichtig."
msgid "Profile changes saved"
msgstr "Das Profil wurde aktualisiert"
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr "Falsches Passwort"
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr "Kontoeinstellungen gespeichert"
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr "Du musst die Löschung deines Kontos bestätigen."
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Du hast bereits eine Sammlung mit Namen »%s«!"
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
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:343
+#: mediagoblin/edit/views.py:329
msgid "You are editing another user's collection. Proceed with caution."
msgstr "Du bearbeitest die Sammlung eines anderen Benutzers. Sei vorsichtig."
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr "Falsches Passwort"
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+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"
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr "Für dieses Theme gibt es kein asset-Verzeichnis\n"
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr "Trotzdem wurde eine alte Verknüpfung gefunden; sie wurde entfernt\n"
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
@@ -286,12 +310,16 @@ 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:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr "Entschuldigung, dieser Dateityp wird nicht unterstützt."
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr "Videokonvertierung fehlgeschlagen"
@@ -358,17 +386,17 @@ 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:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr "Client {0} wurde registriert!"
#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22
msgid "OAuth client connections"
-msgstr ""
+msgstr "OAuth-Client-Verbindungen"
#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22
msgid "Your OAuth clients"
-msgstr ""
+msgstr "Deine OAuth-Clients"
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
@@ -377,7 +405,7 @@ msgstr ""
msgid "Add"
msgstr "Hinzufügen"
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr "Die Datei stimmt nicht mit dem gewählten Medientyp überein."
@@ -385,45 +413,45 @@ msgstr "Die Datei stimmt nicht mit dem gewählten Medientyp überein."
msgid "File"
msgstr "Datei"
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr "Du musst eine Datei angeben."
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr "JAAA! Geschafft!"
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr "Sammlung »%s« hinzugefügt!"
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr "Bitte bestätige Deine E-Mail-Adresse!"
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr "abmelden"
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
msgstr "%(user_name)ss Konto"
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr "Kontoeinstellungen ändern"
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -431,72 +459,25 @@ msgstr "Kontoeinstellungen ändern"
msgid "Media processing panel"
msgstr "Medienverarbeitung"
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
msgstr "Abmelden"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Medien hinzufügen"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "Neues Album erstellen"
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr "Läuft mit MediaGoblin, einem GNU-Projekt."
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr "Veröffentlicht unter der AGPL (Quellcode)."
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr "Bild eines gestressten Goblins"
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr "Entdecken"
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "Hallo du, willkommen auf dieser MediaGoblin-Seite!"
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr "Diese Webseite setzt MediaGoblin ein, eine groÃartige Software für Medienhosting."
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-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/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr "Hast du noch keinen? Das geht ganz einfach!"
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-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"
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr "Neuste Medien"
@@ -602,6 +583,53 @@ msgid ""
"%(verification_url)s"
msgstr "Hallo %(username)s,\n\num deinNutzerkonto bei GNU MediaGoblin zu aktivieren, musst du folgende Adresse in deinem Webbrowser öffnen:\n\n%(verification_url)s"
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr "Läuft mit MediaGoblin, einem GNU-Projekt."
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr "Veröffentlicht unter der AGPL (Quellcode)."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr "Entdecken"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "Hallo du, willkommen auf dieser MediaGoblin-Seite!"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr "Diese Webseite setzt MediaGoblin ein, eine groÃartige Software für Medienhosting."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+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
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -614,13 +642,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:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr "Anhänge"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr "Anhang hinzufügen"
@@ -637,12 +665,22 @@ msgstr "Abbrechen"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -653,7 +691,7 @@ msgid "Yes, really delete my account"
msgstr "Ja, ich möchte mein Konto wirklich löschen"
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "Dauerhaft löschen"
@@ -670,7 +708,11 @@ msgstr "%(media_title)s bearbeiten"
msgid "Changing %(username)s's account settings"
msgstr "%(username)ss Kontoeinstellungen ändern"
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr "Mein Konto löschen"
@@ -695,6 +737,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/video.html:55
msgid "Download"
@@ -719,6 +762,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/video.html:61
msgid "Original file"
msgstr "Originaldatei"
@@ -727,6 +771,7 @@ msgstr "Originaldatei"
msgid "WebM file (Vorbis codec)"
msgstr "WebM-Datei (Vorbis-Codec)"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -737,6 +782,10 @@ 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
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr ""
@@ -835,7 +884,7 @@ msgstr "Möchtest du %(title)s wirklich löschen?"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr "Wirklich »%(media_title)s« aus »%(collection_title)s« entfernen?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr "Entfernen"
@@ -878,24 +927,28 @@ msgstr "%(username)ss Medien"
msgid "â Browsing media by %(username)s"
msgstr "â Medien von %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr "Einen Kommentar schreiben"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr "Kommentar absenden"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
-msgstr "um"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
+#: 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 ""
-"Added on
\n"
-" %(date)s
"
-msgstr "Veröffentlicht am
\n %(date)s
"
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+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
@@ -1051,7 +1104,7 @@ msgstr "älter"
msgid "Tagged with"
msgstr "Schlagwörter"
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr "Die Bilddatei konnte nicht gelesen werden."
@@ -1081,6 +1134,30 @@ msgid ""
" deleted."
msgstr "Tut uns Leid, aber unter der angegebenen Adresse gibt es keine Seite!
Wenn du sicher bist, dass die Adresse stimmt, wurde die Seite eventuell verschoben oder gelöscht."
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr "Kommentar"
@@ -1112,73 +1189,77 @@ msgstr "-- Auswählen --"
msgid "Include a note"
msgstr "Notiz anfügen"
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr "hat dein Medium kommentiert"
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr "Hoppla, der Kommentartext fehlte."
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr "Dein Kommentar wurde angenommen!"
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr "Bitte prüfe deinen Einträge und versuche erneut."
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr "Du musst eine Sammlung auswählen oder hinzufügen"
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "»%s« ist bereits in der Sammlung »%s«"
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "»%s« zur Sammlung »%s« hinzugefügt"
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr "Du hast das Medium gelöscht."
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
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:301
+#: mediagoblin/user_pages/views.py:296
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:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr "Du hast das Objekt aus der Sammlung gelöscht."
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
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:389
+#: mediagoblin/user_pages/views.py:382
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:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "Du hast die Sammlung »%s« gelöscht"
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
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:439
+#: mediagoblin/user_pages/views.py:430
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 6950f515..913c2ec1 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-03-11 17:21-0500\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,32 +17,37 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 0.9.6\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
+#: mediagoblin/auth/forms.py:26
+msgid "Username"
msgstr ""
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
msgstr ""
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
+#: mediagoblin/auth/forms.py:34
+msgid "Email address"
msgstr ""
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
-msgid "Username"
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
msgstr ""
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
-msgid "Password"
+#: mediagoblin/auth/forms.py:52
+msgid "Username or email"
msgstr ""
-#: mediagoblin/auth/forms.py:60
-msgid "Email address"
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
msgstr ""
-#: mediagoblin/auth/forms.py:78
-msgid "Username or email"
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:33
+msgid "This field requires an email address."
msgstr ""
#: mediagoblin/auth/views.py:54
@@ -57,53 +62,53 @@ msgstr ""
msgid "Sorry, a user with that email address already exists."
msgstr ""
-#: mediagoblin/auth/views.py:174
+#: mediagoblin/auth/views.py:182
msgid ""
"Your email address has been verified. You may now login, edit your "
"profile, and submit images!"
msgstr ""
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
msgstr ""
-#: mediagoblin/auth/views.py:198
+#: mediagoblin/auth/views.py:206
msgid "You must be logged in so we know who to send the email to!"
msgstr ""
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr ""
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr ""
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
msgid "An email has been sent with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -114,7 +119,7 @@ msgid "Description of this work"
msgstr ""
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -131,11 +136,11 @@ msgstr ""
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr ""
@@ -163,45 +168,45 @@ msgid "This address contains errors"
msgstr ""
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:64
-msgid "Enter your old password to prove you own this account."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:67
-msgid "New password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:82
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr ""
-#: mediagoblin/edit/forms.py:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:103
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:101
+msgid "Enter your old password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:104
+msgid "New password"
+msgstr ""
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr ""
@@ -226,44 +231,63 @@ msgstr ""
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr ""
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:343
+#: mediagoblin/edit/views.py:329
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr ""
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr ""
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie "
@@ -271,11 +295,15 @@ msgid ""
"this domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr ""
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr ""
@@ -347,7 +375,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr ""
@@ -366,7 +394,7 @@ msgstr ""
msgid "Add"
msgstr ""
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr ""
@@ -374,45 +402,45 @@ msgstr ""
msgid "File"
msgstr ""
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr ""
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr ""
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -420,76 +448,25 @@ msgstr ""
msgid "Media processing panel"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU "
-"project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, "
-"an extraordinarily great piece of media hosting software."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-msgid ""
-"To add your own media, place comments, and more, you can log in with your"
-" MediaGoblin account."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an "
-"account at this site\n"
-" or\n"
-" Set up MediaGoblin on "
-"your own server"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr ""
@@ -594,6 +571,57 @@ msgid ""
"%(verification_url)s"
msgstr ""
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU "
+"project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, "
+"an extraordinarily great piece of media hosting software."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+msgid "Don't have one yet? It's easy!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
+#, python-format
+msgid ""
+"Create an "
+"account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -606,13 +634,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr ""
@@ -629,12 +657,22 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -645,7 +683,7 @@ msgid "Yes, really delete my account"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr ""
@@ -662,7 +700,11 @@ msgstr ""
msgid "Changing %(username)s's account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr ""
@@ -687,6 +729,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/video.html:55
msgid "Download"
@@ -711,6 +754,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr ""
@@ -719,6 +763,7 @@ msgstr ""
msgid "WebM file (Vorbis codec)"
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
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -729,6 +774,10 @@ msgstr ""
msgid "Image for %(media_title)s"
msgstr ""
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr ""
@@ -827,7 +876,7 @@ msgstr ""
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr ""
@@ -871,23 +920,27 @@ msgstr ""
msgid "â Browsing media by %(username)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
+#: 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 ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
-#, python-format
-msgid ""
-"Added on
\n"
-" %(date)s
"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+msgid "Added"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
+msgid "Created"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
@@ -1042,7 +1095,7 @@ msgstr ""
msgid "Tagged with"
msgstr ""
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr ""
@@ -1072,6 +1125,30 @@ msgid ""
"moved or deleted."
msgstr ""
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr ""
@@ -1103,74 +1180,78 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr ""
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr ""
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr ""
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr ""
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
msgid "The media was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:301
+#: mediagoblin/user_pages/views.py:296
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:389
+#: mediagoblin/user_pages/views.py:382
msgid ""
"You are about to delete an item from another user's collection. Proceed "
"with caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
msgid ""
"The collection was not deleted because you didn't check that you were "
"sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:439
+#: mediagoblin/user_pages/views.py:430
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 ac74a68b..406b269f 100644
Binary files a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po
index e7785d73..eb1ec1ec 100644
--- a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po
@@ -3,18 +3,18 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# , 2013.
-# , 2011-2012.
-# Fernando Inocencio , 2011.
-# , 2011.
+# aleksejrs , 2013
+# aleksejrs , 2011-2012
+# Fernando Inocencio , 2011
+# tiguliano , 2011
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-10 16:50+0000\n"
-"Last-Translator: aleksejrs \n"
-"Language-Team: LANGUAGE \n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+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"
"Content-Transfer-Encoding: 8bit\n"
@@ -22,34 +22,39 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
-msgstr "Nevalida ensalutnomo aÅ retpoÅtadreso."
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr "Äi tiu kampo ne akceptas retpoÅtadresojn."
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr "Äi tiu kampo postulas retpoÅtadreson."
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "Uzantnomo"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
msgid "Password"
msgstr "Pasvorto"
-#: mediagoblin/auth/forms.py:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "RetpoÅtadreso"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr "Salutnomo aÅ retpoÅtadreso"
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr "Nevalida ensalutnomo aÅ retpoÅtadreso."
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr "Äi tiu kampo ne akceptas retpoÅtadresojn."
+
+#: mediagoblin/auth/tools.py:33
+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."
@@ -62,54 +67,54 @@ msgstr "BedaÅrinde, uzanto kun tiu nomo jam ekzistas."
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:174
+#: mediagoblin/auth/views.py:182
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:180
+#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
msgstr "La kontrol-kodo aÅ la uzantonomo ne estas korekta"
-#: mediagoblin/auth/views.py:198
+#: mediagoblin/auth/views.py:206
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:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr "Vi jam konfirmis vian retpoÅtadreson!"
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "Resendi vian kontrol-mesaÄon."
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
msgstr "Trovitas neniu kun tiu ensalutnomo."
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
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:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
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:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -120,7 +125,7 @@ msgid "Description of this work"
msgstr "Priskribo de Äi tiu verko"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -136,11 +141,11 @@ msgstr "Etikedoj"
msgid "Separate tags by commas."
msgstr "Dividu la etikedojn per komoj."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "La distingiga adresparto"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "La distingiga adresparto ne povas esti malplena"
@@ -168,45 +173,45 @@ msgid "This address contains errors"
msgstr "Äi tiu adreso enhavas erarojn"
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr "La malnova pasvorto"
-
-#: mediagoblin/edit/forms.py:64
-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:67
-msgid "New password"
-msgstr "La nova pasvorto"
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr "Permesila prefero"
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:82
+#: 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:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr "La titolo ne povas malpleni."
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 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:103
+#: mediagoblin/edit/forms.py:92
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/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr "La malnova pasvorto"
+
+#: mediagoblin/edit/forms.py:101
+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
+msgid "New password"
+msgstr "La nova pasvorto"
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr "Äi tiu uzanto jam havas dosieron kun tiu distingiga adresparto."
@@ -231,44 +236,63 @@ msgstr "Vi redaktas profilon de alia uzanto. Agu singardeme."
msgid "Profile changes saved"
msgstr "ProfilÅanÄoj estis konservitaj"
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr "MalÄusta pasvorto"
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr "Kontagordoj estis konservitaj"
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr "Vi bezonas konfirmi la forigon de via konto."
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Vi jam havas kolekton kun la nomo «%s»!"
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
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:343
+#: mediagoblin/edit/views.py:329
msgid "You are editing another user's collection. Proceed with caution."
msgstr "Vi redaktas kolekton de alia uzanto. Agu singardeme."
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr "MalÄusta pasvorto"
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+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"
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr "Mankas dosierujo kun aspektiloj por la etoso\n"
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr "Tamen trovitas â kaj forigitas â malnova simbola ligilo al dosierujo.\n"
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
@@ -276,12 +300,16 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr "Mi pardonpetas, mi ne subtenas tiun dosiertipon :("
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr "Malsukcesis transkodado de filmo"
@@ -348,7 +376,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr ""
@@ -367,7 +395,7 @@ msgstr ""
msgid "Add"
msgstr "Aldoni"
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr "La provizita dosiero ne konformas al la informtipo."
@@ -375,45 +403,45 @@ msgstr "La provizita dosiero ne konformas al la informtipo."
msgid "File"
msgstr "Dosiero"
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr "Vi devas provizi dosieron."
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr "Hura! AlÅutitas!"
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr "Kolekto «%s» aldonitas!"
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr "Konfirmu viecon de la retpoÅtadreso!"
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr "elsaluti"
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
msgstr "Konto de %(user_name)s"
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr "ÅanÄi kontagordojn"
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -421,72 +449,25 @@ msgstr "ÅanÄi kontagordojn"
msgid "Media processing panel"
msgstr "Kontrolejo pri dosierpreparado."
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
msgstr "Elsaluti"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Aldoni dosieron"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "Krei novan kolekton"
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr "Funkcias per MediaGoblin, unu el la projektoj de GNU."
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr "Disponigita laÅ la permesilo AGPL. Haveblasfontotekstaro."
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr "Bildo de zorgigita koboldo"
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr "ÄirkaÅrigardi"
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "Saluton, kaj bonvenon al Äi tiu MediaGoblina retpaÄaro!"
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr "Äi tiu retpaÄaro funkcias per MediaGoblin, eksterordinare bonega programaro por gastigado de aÅdâvidâdosieroj."
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
-msgstr "Por aldoni viajn proprajn dosierojn, afiÅi komentariojn ktp, vi povas ensaluti je via MediaGoblina konto."
-
-#: mediagoblin/templates/mediagoblin/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr "Äu vi ankoraÅ ne havas tian? Ne malÄoju!"
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "Kreu konton en Äi tiu retejo\n aÅ\n ekfunkciigu MediaGoblinâon en via propra servilo"
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr "Laste aldonitaj dosieroj"
@@ -592,6 +573,53 @@ msgid ""
"%(verification_url)s"
msgstr "Sal %(username)s,\n\npor aktivigi vian GNU MediaGoblin konton, malfermu la sekvantan URLon en via retumilo:\n\n%(verification_url)s"
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr "Funkcias per MediaGoblin, unu el la projektoj de GNU."
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr "Disponigita laÅ la permesilo AGPL. Haveblasfontotekstaro."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr "ÄirkaÅrigardi"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "Saluton, kaj bonvenon al Äi tiu MediaGoblina retpaÄaro!"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr "Äi tiu retpaÄaro funkcias per MediaGoblin, eksterordinare bonega programaro por gastigado de aÅdâvidâdosieroj."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+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
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -604,13 +632,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:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr "Kundosieroj"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr "Aldoni kundosieron"
@@ -627,12 +655,22 @@ msgstr "Nuligi"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -643,7 +681,7 @@ msgid "Yes, really delete my account"
msgstr "Jes, efektive forigi mian konton"
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "Forigi senrevene"
@@ -660,7 +698,11 @@ 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:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr "Forigi mian konton."
@@ -685,6 +727,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/video.html:55
msgid "Download"
@@ -709,6 +752,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/video.html:61
msgid "Original file"
msgstr "originalan dosieron"
@@ -717,6 +761,7 @@ msgstr "originalan dosieron"
msgid "WebM file (Vorbis codec)"
msgstr "WebMan dosieron (kun Vorbisa kodaĵo)"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -727,6 +772,10 @@ 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
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr ""
@@ -825,7 +874,7 @@ msgstr "Äu vere forigi %(title)s?"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr "Äu vere forigi %(media_title)s el %(collection_title)s?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr "Forigi"
@@ -868,24 +917,28 @@ msgstr "Dosieroj de %(username)s"
msgid "â Browsing media by %(username)s"
msgstr "â ÐÑоÑмоÑÑ Ñайлов полÑзоваÑÐµÐ»Ñ %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr "Aldoni komenton"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr "Aldoni Äi tiun komenton"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
-msgstr "je"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
+#: 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 ""
-"Added on
\n"
-" %(date)s
"
-msgstr "Aldonita je
\n la %(date)s
"
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+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
@@ -1041,7 +1094,7 @@ msgstr "malpli nova"
msgid "Tagged with"
msgstr "Markita per"
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr "Malsukcesis lego de la bildodosiero"
@@ -1071,6 +1124,30 @@ msgid ""
" deleted."
msgstr ""
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr "Komenti"
@@ -1102,73 +1179,77 @@ msgstr "-- Elektu --"
msgid "Include a note"
msgstr "Rimarko"
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr "komentis je via afiÅo"
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr "Oj, via komento estis malplena."
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr "Via komento estis afiÅita!"
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr "Bonvolu kontroli vian enigitaĵon kaj reprovi."
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr "Necesas elekti aÅ aldoni kolekton"
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "«%s» jam estas en la kolekto «%s»"
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "«%s» estis aldonita al la kolekto «%s»"
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr "Vi forigis la dosieron."
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
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:301
+#: mediagoblin/user_pages/views.py:296
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:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr "Vi forigis la dosieron el la kolekto."
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
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:389
+#: mediagoblin/user_pages/views.py:382
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:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "Vi forigis la kolekton «%s»"
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
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:439
+#: mediagoblin/user_pages/views.py:430
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 e2df0731..ececfb2e 100644
Binary files a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
index 21dce0b1..03e755ab 100644
--- a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
@@ -3,24 +3,24 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# , 2011, 2012.
-# , 2011.
-# , 2011-2012.
-# Javier Di Mauro , 2011.
-# , 2011.
-# , 2011, 2012.
-# , 2012.
-# Laura Arjona Reina , 2013.
-# Mario Rodriguez , 2011.
-# , 2011.
-# , 2012.
-# , 2012.
+# aleksejrs , 2011, 2012
+# ekenbrand , 2011
+# nvjacobo , 2011-2012
+# Javier Di Mauro , 2011
+# case , 2011
+# juanman , 2011, 2012
+# larjona , 2012
+# larjona , 2013
+# Mario Rodriguez , 2011
+# Manuel Urbano Santos , 2011
+# shackra , 2012
+# Elesa , 2012
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-05 00:04+0000\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/mediagoblin/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -30,34 +30,39 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
-msgstr "Nombre de usuario o correo electrónico inválido."
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr "Este campo no acepta direcciones de correo."
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr "Este campo requiere una dirección de correo."
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "Nombre de usuario"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: 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:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "Dirección de correo electrónico"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr "Nombre de usuario o email"
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr "Nombre de usuario o correo electrónico inválido."
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr "Este campo no acepta direcciones de correo."
+
+#: mediagoblin/auth/tools.py:33
+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."
@@ -70,54 +75,54 @@ msgstr "Lo sentimos, ya existe un usuario con ese nombre."
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:174
+#: mediagoblin/auth/views.py:182
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:180
+#: mediagoblin/auth/views.py:188
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:198
+#: mediagoblin/auth/views.py:206
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:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr "¡Ya has verificado tu dirección de correo!"
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "Se reenvió tu correo electrónico de verificación."
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
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:261
+#: mediagoblin/auth/views.py:269
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:264
+#: mediagoblin/auth/views.py:272
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:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
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:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -128,7 +133,7 @@ msgid "Description of this work"
msgstr "Descripción de esta obra"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -144,11 +149,11 @@ msgstr "Etiquetas"
msgid "Separate tags by commas."
msgstr "Separa las etiquetas por comas."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Ficha"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "La ficha no puede estar vacÃa"
@@ -176,45 +181,45 @@ msgid "This address contains errors"
msgstr "La dirección contiene errores"
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr "Vieja contraseña"
-
-#: mediagoblin/edit/forms.py:64
-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:67
-msgid "New password"
-msgstr "Nueva contraseña"
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr "Preferencias de licencia"
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
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:82
+#: 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:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr "El tÃtulo no puede estar vacÃo"
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 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:103
+#: mediagoblin/edit/forms.py:92
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/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr "Vieja contraseña"
+
+#: mediagoblin/edit/forms.py:101
+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
+msgid "New password"
+msgstr "Nueva contraseña"
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr "Una entrada con esa ficha ya existe para este usuario."
@@ -239,44 +244,63 @@ msgstr "Estás editando un perfil de usuario. Procede con precaución."
msgid "Profile changes saved"
msgstr "Los cambios de perfil fueron salvados"
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr "Contraseña incorrecta"
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr "las configuraciones de cuenta fueron salvadas"
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr "Necesitas confirmar el borrado de tu cuenta."
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "¡Ya tienes una colección llamada \"%s\"!"
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
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:343
+#: mediagoblin/edit/views.py:329
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/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr "Contraseña incorrecta"
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+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"
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr "No hay directorio activo para este tema\n\n\n"
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr "Sin embargo, se encontró un enlace simbólico de un directorio antiguo; ha sido borrado.\n"
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
@@ -284,12 +308,16 @@ 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:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr "Lo sentidos, No soportamos ese tipo de archivo :("
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr "Ha fallado la conversión de vÃdeo"
@@ -356,7 +384,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:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr "¡El cliente {0} ha sido registrado!"
@@ -375,7 +403,7 @@ msgstr "Tus clientes OAuth"
msgid "Add"
msgstr "Añadir "
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr "Archivo inválido para el formato seleccionado."
@@ -383,45 +411,45 @@ msgstr "Archivo inválido para el formato seleccionado."
msgid "File"
msgstr "Archivo"
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr "Debes proporcionar un archivo."
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr "¡Yuju! ¡Enviado!"
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr "¡Colección \"%s\" añadida!"
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr "¡Verifica tu email!"
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr "cerrar sesión"
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
msgstr "Cuenta de %(user_name)s"
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr "Cambiar la configuración de la cuenta"
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -429,72 +457,25 @@ msgstr "Cambiar la configuración de la cuenta"
msgid "Media processing panel"
msgstr "Panel de procesamiento de contenido"
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
-msgstr ""
+msgstr "Cerrar sesión"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Añadir contenido"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "Crear nueva colección"
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr "Funciona con MediaGoblin, un proyecto GNU."
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr "Publicado bajo la AGPL. Código fuente disponible."
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr "Imagen de un goblin estresándose"
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr "Explorar"
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "Hola, ¡bienvenido a este sitio de MediaGoblin!"
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr "Este sitio está montado con MediaGoblin, un extraordinario programa libre para alojar, gestionar y compartir contenido multimedia."
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
-msgstr "Para añadir tus propios contenidos, dejar comentarios y más, puedes iniciar sesión con tu cuenta de MediaGoblin."
-
-#: mediagoblin/templates/mediagoblin/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr "¿Aún no tienes una? ¡Es fácil!"
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "Crea una cuenta en este sitio\n o\n Instala Mediagoblin en tu propio servidor"
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr "El contenido más reciente"
@@ -600,6 +581,53 @@ msgid ""
"%(verification_url)s"
msgstr "Hola %(username)s,\n\npara activar tu cuenta de GNU MediaGoblin, abre la siguiente URL en tu navegador:\n\n%(verification_url)s "
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr "Funciona con MediaGoblin, un proyecto GNU."
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr "Publicado bajo la AGPL. Código fuente disponible."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr "Explorar"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "Hola, ¡bienvenido a este sitio de MediaGoblin!"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr "Este sitio está montado con MediaGoblin, un extraordinario programa libre para alojar, gestionar y compartir contenido multimedia."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+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
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -612,13 +640,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:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr "Adjuntos"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr "Agregar adjunto"
@@ -635,12 +663,22 @@ msgstr "Cancelar"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -651,7 +689,7 @@ msgid "Yes, really delete my account"
msgstr "SÃ, borrar mi cuenta"
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "Eliminar permanentemente"
@@ -668,7 +706,11 @@ 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:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr "Borrar mi cuenta"
@@ -693,6 +735,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/video.html:55
msgid "Download"
@@ -717,6 +760,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/video.html:61
msgid "Original file"
msgstr "Archivo original"
@@ -725,6 +769,7 @@ msgstr "Archivo original"
msgid "WebM file (Vorbis codec)"
msgstr "Archivo WebM (códec Vorbis)"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -735,6 +780,10 @@ 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
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr "Alternar Rotar"
@@ -833,7 +882,7 @@ msgstr "¿Realmente deseas eliminar %(title)s?"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr "¿Realmente quieres quitar %(media_title)s de %(collection_title)s?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr "Quitar"
@@ -876,24 +925,28 @@ msgstr "Contenido de %(username)s"
msgid "â Browsing media by %(username)s"
msgstr "â Explorando contenido de %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr "Añadir un comentario"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr "Añade un comentario "
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
-msgstr "en"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
+#: 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 ""
-"Added on
\n"
-" %(date)s
"
-msgstr "Añadido en
\n %(date)s
"
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+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
@@ -1049,7 +1102,7 @@ msgstr "Más viejo"
msgid "Tagged with"
msgstr "Marcado con"
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr "No se pudo leer el archivo de imagen."
@@ -1079,6 +1132,30 @@ msgid ""
" deleted."
msgstr "Parece que no hay ninguna página en esta dirección. ¡Lo siento!
Si estás seguro de que la dirección es correcta, quizá han borrado o movido la página que estás buscando."
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr "Comentario"
@@ -1110,73 +1187,77 @@ msgstr "-- Selecciona --"
msgid "Include a note"
msgstr "Incluir una nota"
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr "comentó tu publicación"
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr "Ups, tu comentario estaba vacÃo."
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr "¡Tu comentario ha sido publicado!"
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr "Por favor, revisa tus entradas e inténtalo de nuevo."
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr "Tienes que seleccionar o añadir una colección"
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "%s\" ya está en la colección \"%s\""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "\"%s\" añadido a la colección \"%s\""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr "Eliminaste el contenido"
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
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:301
+#: mediagoblin/user_pages/views.py:296
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:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr "Borraste el Ãtem de la colección."
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
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:389
+#: mediagoblin/user_pages/views.py:382
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:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "Borraste la colección \"%s\""
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
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:439
+#: mediagoblin/user_pages/views.py:430
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 4b319ebd..3422ad97 100644
Binary files a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po
index 028ab5d4..08e73e1a 100644
--- a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# , 2012.
+# Numb , 2012
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-05 00:04+0000\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+0000\n"
"Last-Translator: cwebber \n"
-"Language-Team: LANGUAGE \n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/mediagoblin/language/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -19,34 +19,39 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "ÙاÙ
کاربرÛ"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
msgid "Password"
msgstr "گذرÙاٰÚÙ"
-#: mediagoblin/auth/forms.py:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "آدرس اÛÙ
ÛÙ"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr ""
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:33
+msgid "This field requires an email address."
+msgstr ""
+
#: mediagoblin/auth/views.py:54
msgid "Sorry, registration is disabled on this instance."
msgstr "Ù
تاسÙاÙÙØثبتÙاÙ
ب٠طÙر Ù
ÙÙت غÛر Ùعا٠است."
@@ -59,54 +64,54 @@ msgstr "Ù
تاسÙاÙÙ Ú©Ø§Ø±Ø¨Ø±Û Ø¨Ø§ اÛÙ ÙاÙ
Ú©Ø§Ø±Ø¨Ø±Û ÙجÙد
msgid "Sorry, a user with that email address already exists."
msgstr ""
-#: mediagoblin/auth/views.py:174
+#: mediagoblin/auth/views.py:182
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "اÛÙ
ÛÙ Ø´Ù
ا تاÛÛد شد.Ø´Ù
ا Ù
Û ØªÙاÙÛد ØاÙا Ùارد Ø´ÙÛدØÙÙ
اÛÙ Ø®Ùد را ÙÛراÛØ´ Ú©ÙÛد ٠تصاÙÛر Ø®Ùد را ثبت Ú©ÙÛد!"
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
msgstr "اÛ٠کد تاÛÛدÛÙ Ûا Ø´ÙØ§Ø³Ù Ú©Ø§Ø±Ø¨Ø±Û ØµØÛØ ÙÛست."
-#: mediagoblin/auth/views.py:198
+#: mediagoblin/auth/views.py:206
msgid "You must be logged in so we know who to send the email to!"
msgstr ""
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr ""
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "اÛÙ
Û٠تاÛÛدÛ٠باز ارسا٠شد."
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -117,7 +122,7 @@ msgid "Description of this work"
msgstr ""
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -133,11 +138,11 @@ msgstr "برÚسب"
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr ""
@@ -165,45 +170,45 @@ msgid "This address contains errors"
msgstr ""
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:64
-msgid "Enter your old password to prove you own this account."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:67
-msgid "New password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:82
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr ""
-#: mediagoblin/edit/forms.py:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:103
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:101
+msgid "Enter your old password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:104
+msgid "New password"
+msgstr ""
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr ""
@@ -228,44 +233,63 @@ msgstr "Ø´Ù
ا در Øا٠ÙÛراÛØ´ ÙÙ
اÛ٠کاربر دÛÚ¯Ø±Û Ùست
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr ""
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:343
+#: mediagoblin/edit/views.py:329
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr ""
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr ""
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
@@ -273,12 +297,16 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr ""
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr ""
@@ -345,7 +373,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr ""
@@ -364,7 +392,7 @@ msgstr ""
msgid "Add"
msgstr ""
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr "ÙاÛÙÛ Ùا Ù
عتبر Ø¨Ø±Ø§Û ÙÙع رساÙ٠داد٠شدÙ."
@@ -372,45 +400,45 @@ msgstr "ÙاÛÙÛ Ùا Ù
عتبر Ø¨Ø±Ø§Û ÙÙع رساÙ٠داد٠شدÙ."
msgid "File"
msgstr "ÙاÛÙ"
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr "Ø´Ù
ا باÛد ÙاÛÙÛ Ø§Ø±Ø§Ù٠بدÙÛد."
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr "ÙÙرا!ثبت شد!"
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -418,72 +446,25 @@ msgstr ""
msgid "Media processing panel"
msgstr "Ù¾Ù٠رسÛØ¯Ú¯Û Ø¨Ù Ø±Ø³Ø§ÙÙ Ùا"
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr ""
@@ -589,6 +570,53 @@ msgid ""
"%(verification_url)s"
msgstr "سÙاÙ
%(username)s,\n\nØ¨Ø±Ø§Û ÙØ¹Ø§Ù Ø³Ø§Ø²Û Ø´ÙØ§Ø³Ù Ú©Ø§Ø±Ø¨Ø±Û Ú¯ÙÙ Ù
دÛاگÙبÙÛÙ Ø®Ùد ØÙ¾ÛÙÙد زÛر را در Ù
رÙرگر Ø®Ùد باز Ú©ÙÛد.\n\n%(verification_url)s"
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+msgid "Don't have one yet? It's easy!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
+#, python-format
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -601,13 +629,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr ""
@@ -624,12 +652,22 @@ msgstr "اÙصراÙ"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -640,7 +678,7 @@ msgid "Yes, really delete my account"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr ""
@@ -657,7 +695,11 @@ msgstr "ÙÛراÛØ´ %(media_title)s"
msgid "Changing %(username)s's account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr ""
@@ -682,6 +724,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/video.html:55
msgid "Download"
@@ -706,6 +749,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr ""
@@ -714,6 +758,7 @@ msgstr ""
msgid "WebM file (Vorbis codec)"
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
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -724,6 +769,10 @@ msgstr ""
msgid "Image for %(media_title)s"
msgstr ""
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr ""
@@ -822,7 +871,7 @@ msgstr ""
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr ""
@@ -865,23 +914,27 @@ msgstr "%(username)s's رساÙÙ ÙاÛ"
msgid "â Browsing media by %(username)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
+#: 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 ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
-#, python-format
-msgid ""
-"Added on
\n"
-" %(date)s
"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+msgid "Added"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
+msgid "Created"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
@@ -1038,7 +1091,7 @@ msgstr ""
msgid "Tagged with"
msgstr ""
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr ""
@@ -1068,6 +1121,30 @@ msgid ""
" deleted."
msgstr ""
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr ""
@@ -1099,73 +1176,77 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr ""
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr ""
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr ""
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr ""
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
msgid "The media was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:301
+#: mediagoblin/user_pages/views.py:296
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:389
+#: mediagoblin/user_pages/views.py:382
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:439
+#: mediagoblin/user_pages/views.py:430
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 ada992ce..7bc860a0 100644
Binary files a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po
index b4c76bd2..6103c439 100644
--- a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po
@@ -3,22 +3,22 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# , 2011.
-# , 2012.
-# , 2011.
-# , 2013.
-# , 2011.
-# Laurent Pointecouteau , 2013.
-# , 2011.
-# , 2011.
-# , 2011.
-# Valentin Villenave , 2011.
+# ianux , 2011
+# alcazar , 2012
+# chesuidayeur , 2011
+# Bibit , 2013
+# joehillen , 2011
+# hellpe , 2013
+# MarkTraceur , 2011
+# maxineb , 2011
+# joar , 2011
+# Valentin Villenave , 2011
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-05 00:04+0000\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+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,34 +28,39 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
-msgstr "Nom d'utilisateur ou adresse de courriel invalide."
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "Nom d'utilisateur"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: 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:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "Adresse e-mail"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr "Nom d'utilisateur ou email"
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr "Nom d'utilisateur ou adresse de courriel invalide."
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:33
+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é."
@@ -68,54 +73,54 @@ msgstr "Un utilisateur existe déjà avec ce nom, désolé."
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:174
+#: mediagoblin/auth/views.py:182
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:180
+#: mediagoblin/auth/views.py:188
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:198
+#: mediagoblin/auth/views.py:206
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:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr "Votre adresse e-mail a déjà été vérifiée !"
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "E-mail de vérification renvoyé."
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
msgstr "Nom d'utilisateur introuvable."
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
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:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
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:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -126,7 +131,7 @@ msgid "Description of this work"
msgstr "Descriptif pour ce travail"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -142,11 +147,11 @@ msgstr "Tags"
msgid "Separate tags by commas."
msgstr "Séparez les champs avec des virgules."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Légende"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "La légende ne peut pas être laissée vide."
@@ -174,45 +179,45 @@ msgid "This address contains errors"
msgstr "Cette adresse contiens des erreurs"
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr "Ancien mot de passe."
-
-#: mediagoblin/edit/forms.py:64
-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:67
-msgid "New password"
-msgstr "Nouveau mot de passe"
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:82
+#: 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:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr "Le titre ne peut être vide"
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 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:103
+#: mediagoblin/edit/forms.py:92
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/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr "Ancien mot de passe."
+
+#: mediagoblin/edit/forms.py:101
+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
+msgid "New password"
+msgstr "Nouveau mot de passe"
+
+#: mediagoblin/edit/views.py:67
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."
@@ -237,44 +242,63 @@ msgstr "Vous vous apprêtez à modifier le profil d'un utilisateur. Veuillez pre
msgid "Profile changes saved"
msgstr "Les changements apportés au profile ont étés sauvegardés"
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr "Mauvais mot de passe"
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr "Les changements des préférences du compte ont étés sauvegardés"
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr "Vous devez confirmer la suppression de votre compte."
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Vous avez déjà une collection appelée \"%s\" !"
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:343
+#: mediagoblin/edit/views.py:329
msgid "You are editing another user's collection. Proceed with caution."
msgstr "Vous éditez la collection d'un autre utilisateurs. Faites attention."
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr "Mauvais mot de passe"
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+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"
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr "Aucun répertoire \"asset\" pour ce thème\n"
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr ""
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
@@ -282,12 +306,16 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
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/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr "L'encodage de la vidéo à échoué"
@@ -354,7 +382,7 @@ msgstr "L'URI de redirection pour l'application, ce champ est requis%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr "Changer les paramètres du compte"
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -427,72 +455,25 @@ msgstr "Changer les paramètres du compte"
msgid "Media processing panel"
msgstr "Panneau pour le traitement des médias"
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Ajouter des médias"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "Créer une nouvelle collection"
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr "Disponible sous la licence AGPL. Code source disponible."
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr "Explorer"
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "Bonjour, et bienvenue sur ce site MediaGoblin !"
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr "Ce site fait tourner MediaGoblin, un logiciel d'hébergement de média extraordinairement génial."
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-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/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr "Vous n'en avez pas ? C'est facile !"
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "Créez un compte sur ce site\n ou\n Déployez MediaGoblin sur votre propre serveur"
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr "Tout derniers media"
@@ -598,6 +579,53 @@ msgid ""
"%(verification_url)s"
msgstr "Bonjour %(username)s,\n\npour activer votre compte sur GNU MediaGoblin, veuillez vous rendre à l'adresse suivante avec votre navigateur web:\n\n%(verification_url)s"
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr "Disponible sous la licence AGPL. Code source disponible."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr "Explorer"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "Bonjour, et bienvenue sur ce site MediaGoblin !"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr "Ce site fait tourner MediaGoblin, un logiciel d'hébergement de média extraordinairement génial."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+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
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -610,13 +638,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:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr "Pièces jointes"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr "Ajouter une pièce jointe"
@@ -633,12 +661,22 @@ msgstr "Annuler"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -649,7 +687,7 @@ msgid "Yes, really delete my account"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "Supprimer définitivement"
@@ -666,7 +704,11 @@ 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:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr ""
@@ -691,6 +733,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/video.html:55
msgid "Download"
@@ -715,6 +758,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/video.html:61
msgid "Original file"
msgstr "Fichier original"
@@ -723,6 +767,7 @@ msgstr "Fichier original"
msgid "WebM file (Vorbis codec)"
msgstr "fichier WebM (codec Vorbis)"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -733,6 +778,10 @@ 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
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr ""
@@ -831,7 +880,7 @@ msgstr "Voulez-vous vraiment supprimer %(title)s ?"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr "Voulez vous vraiment retirer %(media_title)s de %(collection_title)s ?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr "Retirer"
@@ -874,24 +923,28 @@ 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:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr "Ajouter un commentaire"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr "Ajouter ce commentaire"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
-msgstr "Ã "
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
+#: 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 ""
-"Added on
\n"
-" %(date)s
"
-msgstr "Ajouté le
\n%(date)s
"
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+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
@@ -1047,7 +1100,7 @@ msgstr "le plus vieux"
msgid "Tagged with"
msgstr "Taggé avec"
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr "Impossible de lire l'image."
@@ -1077,6 +1130,30 @@ msgid ""
" deleted."
msgstr "Il ne semble pas y avoir de page à cette adresse. Désolé !
Si vous êtes sûr que l'adresse est correcte, peut-être que la page que vous recherchez a été déplacée ou supprimée."
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr ""
@@ -1108,73 +1185,77 @@ msgstr "-- Sélectionner --"
msgid "Include a note"
msgstr "Inclure une note"
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr "a commenté votre post"
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr "Oups, votre commentaire était vide."
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr "Votre commentaire a été posté !"
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr "Veuillez vérifier vos entrées et réessayer."
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr "Vous devez sélectionner ou ajouter une collection"
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "\"%s\" est déjà dans la collection \"%s\""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "\"%s\" as été ajouté à la collection \"%s\""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr "Vous avez supprimé le media."
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
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:301
+#: mediagoblin/user_pages/views.py:296
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:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr "Vous avez supprimé cet élément de la collection."
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
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:389
+#: mediagoblin/user_pages/views.py:382
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:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "Vous avez supprimé la collection \"%s\""
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
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:439
+#: mediagoblin/user_pages/views.py:430
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 ce2963f7..e2c22c79 100644
Binary files a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po
index 12d932c8..0cef1736 100644
--- a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po
@@ -3,16 +3,17 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# , 2012.
-# Isratine Citizen , 2012.
+# GenghisKhan , 2013
+# GenghisKhan , 2012
+# GenghisKhan , 2012
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-05 00:04+0000\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+0000\n"
"Last-Translator: cwebber \n"
-"Language-Team: LANGUAGE \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"
"Content-Transfer-Encoding: 8bit\n"
@@ -20,34 +21,39 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "×©× ×שת×ש"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
msgid "Password"
msgstr "ס×ס××"
-#: mediagoblin/auth/forms.py:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "×ת××ת ××××´×"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr "×©× ×שת×ש ×× ××××´×"
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr "×©× ×שת×ש ×× ××××´× ×©×××."
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr "ש×× ×× ×× ×××§× ×ת×××ת ××××´×."
+
+#: mediagoblin/auth/tools.py:33
+msgid "This field requires an email address."
+msgstr "ש×× ×× ×צר×× ×ת××ת ××××´×."
+
#: mediagoblin/auth/views.py:54
msgid "Sorry, registration is disabled on this instance."
msgstr "צר ××, ר×ש×× ××× × ×× ×××¨× ×¢× ×©×¨×ª ××."
@@ -60,54 +66,54 @@ msgstr "צר ××, ×שת×ש ×¢× ×©× ×× ××ר ק×××."
msgid "Sorry, a user with that email address already exists."
msgstr "צר ××, ×שת×ש ×¢× ××××´× ×× ××ר ק×××."
-#: mediagoblin/auth/views.py:174
+#: mediagoblin/auth/views.py:182
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "×ת××ת ×××××´× ×©×× ×××ת×. ×עת ××פשר××ª× ××ת××ר, ×ער×× ×ת ××××§× ×, ××ש××× ×ª××× ×ת!"
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
msgstr "××¤×ª× ×××××ת ×× ×××ת ×שת×ש ××× × ×©×××××"
-#: mediagoblin/auth/views.py:198
+#: mediagoblin/auth/views.py:206
msgid "You must be logged in so we know who to send the email to!"
msgstr "×¢××× ××ת××ר ×¢× ×× ×ª ×©× ××¢ ×× ×× ×ש××× ×ת ×××××´×!"
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr "××ר ×××תת ×ת ×ת××ת ×××××´× ×©××!"
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "ש×× ×©×× ×ת ××××´× ×××××ת ש××."
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
-msgstr ""
+msgstr "××××× ××ת××ת ×××××´× ××× (ת××× ×¨×ש××ת!) רש××× ××××´× × ×©×× ×¢× ××ר××ת ×× ×××¢ ××××¦× ××©× ×ת ×ת ס×ס×ת×."
-#: mediagoblin/auth/views.py:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
-msgstr ""
+msgstr "×× ××× × ××ª× ××צ×× ××ש×× ×¢× ×©× ×שת×ש ××."
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "××××´× × ×©×× ×צ×ר××£ ××ר××ת ×× ×××¢ ××××¦× × ××ª× ××©× ×ת ×ת ס×ס×ת×."
-#: mediagoblin/auth/views.py:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
msgid "You can now log in using your new password."
msgstr "×עת ××××××ª× ××ת××ר ×××צע×ת ס×ס××ª× ×××ש×."
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -118,7 +124,7 @@ msgid "Description of this work"
msgstr "ת×××ר ×©× ××××× ××"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -134,11 +140,11 @@ msgstr "ת×××ת"
msgid "Separate tags by commas."
msgstr "××¤×¨× ×ª×××ת ××¢×רת פס×ק××."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "×ש×פ×ת"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "××ש×פ×ת ×× ××××× ××××ת ר×ק×"
@@ -166,45 +172,45 @@ msgid "This address contains errors"
msgstr "×ת××ת ×× ××××× ×©××××ת"
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr "ס×ס×× ××©× ×"
-
-#: mediagoblin/edit/forms.py:64
-msgid "Enter your old password to prove you own this account."
-msgstr "××× ×ת ס×ס××ª× ×××©× × ××× ×××××× ×©××ª× ×××¢××× ×©× ×ש××× ××."
-
-#: mediagoblin/edit/forms.py:67
-msgid "New password"
-msgstr "ס×ס×× ××ש×"
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
-msgstr ""
+msgstr "×¢××פ×ת רש×××"
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
-msgstr ""
+msgstr "×× ×××× ×רש×××× ××שת×× (×ר×רת ××××) ש×× ××××¤×¡× ××¢×××."
-#: mediagoblin/edit/forms.py:82
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr "ש×× ×× ××××´× ××שר ××ר×× ×××××× ×¢× ××××× ×©××"
-#: mediagoblin/edit/forms.py:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr "×××תרת ×× ××××× ××××ת ר×ק×"
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "ת×××ר ××סף ××"
-#: mediagoblin/edit/forms.py:103
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr "×××ר ×××תרת ×©× ×ת××ת ××סף ××. ×ר×× ××× ×××¨× ××©× ×ת ×ת ××ק ××."
-#: mediagoblin/edit/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr "ס×ס×× ××©× ×"
+
+#: mediagoblin/edit/forms.py:101
+msgid "Enter your old password to prove you own this account."
+msgstr "××× ×ת ס×ס××ª× ×××©× × ××× ×××××× ×©××ª× ×××¢××× ×©× ×ש××× ××."
+
+#: mediagoblin/edit/forms.py:104
+msgid "New password"
+msgstr "ס×ס×× ××ש×"
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr "רש××× ×¢× ×ש×פ×ת ×× ××ר ק×××ת ×¢××ר ×שת×ש ××."
@@ -219,7 +225,7 @@ msgstr "××ספת ×ת ×תצר××£ %s!"
#: mediagoblin/edit/views.py:182
msgid "You can only edit your own profile."
-msgstr ""
+msgstr "××פשר××ª× ×ער×× ×¨×§ ×ת ×××××§× ×©××."
#: mediagoblin/edit/views.py:188
msgid "You are editing a user's profile. Proceed with caution."
@@ -229,57 +235,80 @@ msgstr "××ª× ×¢××¨× ××××§× ×©× ×שת×ש. ×××©× ××××ר×ת."
msgid "Profile changes saved"
msgstr "ש×× ××× ××××§× × ×©×ר×"
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr "ס×ס×× ×©××××"
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr "×××ר×ת ×ש××× × ×©×ר×"
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
-msgstr ""
+msgstr "×¢××× ×××ת ×ת ×××××§× ×©× ×ש××× ×."
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "××ר ×ש ×× ××סף שקר×× ××©× \"%s\"!"
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
msgid "A collection with that slug already exists for this user."
msgstr "××סף ×¢× ×ש×פ×ת ×× ××ר ק××× ×¢××ר ×שת×ש ××."
-#: mediagoblin/edit/views.py:343
+#: mediagoblin/edit/views.py:329
msgid "You are editing another user's collection. Proceed with caution."
msgstr "××ª× ×¢××¨× ××סף ×©× ×שת×ש ××ר. ×××©× ××××ר×ת."
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr "ס×ס×× ×©××××"
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr "×× × ××ª× ×קשר ×× ×××××... ×× ××××ר ×××××\n"
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr "××× ×××ר × ×ס ×¢××ר ××××× ××\n"
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr "××× ××פ×, ק×ש×ר ×××ר symlink × ×צ×; ××סר.\n"
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
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 ""
+msgstr "×¢××××ת CSRF ×× × ×××ת. ×× ×§×¨×× ×××××× × ×××¢ ×ש×× ×××¡× ×¢××××× ×× ×ש×× ×ס×× ××.
×××× ×§×××¢× ×©× ×¢××××ת ×¢××ר ת××× ××."
-#: mediagoblin/media_types/__init__.py:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr "צר ××, ××× × × ×ª××× ×××פ×ס ק×××¥ ×× :("
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr "××רת ××××× × ×ש××"
@@ -316,7 +345,7 @@ msgstr "ת×××ר"
msgid ""
"This will be visible to users allowing your\n"
" application to authenticate as them."
-msgstr ""
+msgstr "×× ×ר×× ××שת×ש×× ×©×ת×ר××\n ×××ש×××× ×©×× ×××ת ××ת×."
#: mediagoblin/plugins/oauth/forms.py:40
msgid "Type"
@@ -346,17 +375,17 @@ msgstr ""
msgid "This field is required for public clients"
msgstr "ש×× ×× ××× × ×ר×ש ×¢××ר ×ק×××ת פ××××××"
-#: mediagoblin/plugins/oauth/views.py:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr "××ק×× {0} × ×¨×©×!"
#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22
msgid "OAuth client connections"
-msgstr ""
+msgstr "×××××¨× ×ק×× OAuth"
#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22
msgid "Your OAuth clients"
-msgstr ""
+msgstr "×ק×××ת OAuth ש××"
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
@@ -365,7 +394,7 @@ msgstr ""
msgid "Add"
msgstr "××סף"
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr "× ××ª× ×§×××¥ ש××× ×¢××ר ××פ×ס ××××."
@@ -373,45 +402,45 @@ msgstr "× ××ª× ×§×××¥ ש××× ×¢××ר ××פ×ס ××××."
msgid "File"
msgstr "ק×××¥"
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr "×¢××× ×ספק ק×××¥."
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr "××××! × ×©××!"
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr "××סף \"%s\" ×ת××סף!"
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr "××ת ×ת ×××××´× ×©××!"
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr "××ª× ×ª×§×ת"
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
msgstr "××ש××× ×©× %(user_name)s"
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr "×©× × ×××ר×ת ×ש×××"
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -419,72 +448,25 @@ msgstr "×©× × ×××ר×ת ×ש×××"
msgid "Media processing panel"
msgstr "××× ×¢×××× ××××"
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
-msgstr ""
+msgstr "××ª× ×ª×§×ת"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "××ספת ××××"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "צ×ר ××סף ××ש"
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr "×ש××רר ת×ת ×רש××× AGPL. ק×× ×ק×ר ××××."
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr "ת××× × ×©× ×××××× ×ת×××¥ ×תר ×¢× ×××××"
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr "××ק×ר"
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "ש××× ××, ×ר×× ×××× ×× ×תר MediaGoblin ××!"
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr "×תר ×× ×ר××¥ MediaGoblin, ×ת××ת ת××× ×ª ××ר×× ×××× ××צ×ת ×× ××××."
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
-msgstr "×××× ×××ס××£ ×ת ××××× ×©××, ××ש×× ×ª××××ת, ××¢××, ××××××ª× ××ת××ר ×¢× ×ש××× MediaGoblin."
-
-#: mediagoblin/templates/mediagoblin/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr "××× ×רש××ª× ×ש××× ×¢××××? ×× ×§×!"
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "×צ×רת ×ש××× ××¦× ×תר ××\n ××\n ××תק×× ×ת MediaGoblin ×¢× ×©×¨×ª×"
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr "××××× ×××ר×× × ×××תר"
@@ -573,11 +555,11 @@ msgstr "ש××ת ×ת ס×ס×ת×?"
#: mediagoblin/templates/mediagoblin/auth/register.html:28
#: mediagoblin/templates/mediagoblin/auth/register.html:36
msgid "Create an account!"
-msgstr "×צ×רת ×ש×××!"
+msgstr "צ×ר ×ש×××!"
#: mediagoblin/templates/mediagoblin/auth/register.html:40
msgid "Create"
-msgstr "×צ×ר×"
+msgstr "צ×ר"
#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19
#, python-format
@@ -590,6 +572,53 @@ msgid ""
"%(verification_url)s"
msgstr "ש××× %(username)s,\n\n×××× ××פע×× ×ת ×ש××× × ××¦× GNU MediaGoblin, ×¢××× ×פת×× ×ת ××ת××ת ××××\n×ת×× ×פ××¤× ×רשת ש××:\n\n%(verification_url)s"
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr "×××× ×¢ ×¢× ××× MediaGoblin, פר×××§× GNU."
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr "×ש××רר ת×ת ×רש××× AGPL. ק×× ×ק×ר ××××."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr "××ק×ר"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "ש××× ××, ×ר×× ×××× ×× ×תר MediaGoblin ××!"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr "×תר ×× ×ר××¥ MediaGoblin, ×ת××ת ת××× ×ª ××ר×× ×××× ××צ×ת ×× ××××."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+msgid "Don't have one yet? It's easy!"
+msgstr "××× ×רש××ª× ×ש××× ×¢××××? ×× ×§×!"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
+#, python-format
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -602,13 +631,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:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr "תצר×פ××"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr "××ספת תצר××£"
@@ -625,23 +654,33 @@ msgstr "×××××"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
-msgstr ""
+msgstr "×××ת ××××ק ×ת ××שת×ש '%(user_name)s' ××ת ×× ×××××/×ת××××ת ×קש×ר×ת?"
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35
msgid "Yes, really delete my account"
-msgstr ""
+msgstr "××, ×××ת ××××ק ×ת ×ש××× ×"
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "××ק ×צ××ת×ת"
@@ -658,10 +697,14 @@ msgstr "ער×× %(media_title)s"
msgid "Changing %(username)s's account settings"
msgstr "ש×× ×× ×××ר×ת ×ש××× ×¢××ר %(username)s"
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
-msgid "Delete my account"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+msgid "Delete my account"
+msgstr "××ק ×ת ××ש××× ×©××"
+
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
@@ -683,6 +726,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/video.html:55
msgid "Download"
@@ -704,9 +748,10 @@ msgid ""
"You can get a modern web browser that \n"
"\tcan play the audio at \n"
"\t http://getfirefox.com!"
-msgstr "××××××ª× ××ש×× ×פ××¤× ×¨×©×ª ××××¨× × ×©×× \n\t×ס××× ×× ×× ×ת ××××× ×× ××¦× \n\t http://getfirefox.com!"
+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/video.html:61
msgid "Original file"
msgstr "ק×××¥ ×ק×ר×"
@@ -715,6 +760,7 @@ msgstr "ק×××¥ ×ק×ר×"
msgid "WebM file (Vorbis codec)"
msgstr "ק×××¥ WebM (ק××ק Vorbis)"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -725,9 +771,13 @@ msgstr "ק×××¥ WebM (ק××ק Vorbis)"
msgid "Image for %(media_title)s"
msgstr "ת××× × ×¢××ר %(media_title)s"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
-msgstr ""
+msgstr "××××£ ס××××"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
@@ -755,7 +805,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
msgid "Download model"
-msgstr ""
+msgstr "×××¨× ××××"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
msgid "File Format"
@@ -770,14 +820,14 @@ msgid ""
"Sorry, this video will not work because\n"
" your web browser does not support HTML5 \n"
" video."
-msgstr ""
+msgstr "צר ××, ××××× ×× ×× ××¢××× ×××××× \n ש×פ××¤× ×רשת ש×× ×× ×ª××× \n ××××× ×©× HTML5."
#: 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 ""
+msgstr "××××××ª× ××ש×× ×פ××¤× ×¨×©×ª ××××¨× × \n ש×× ×ס××× ×× ×× ×ת ××××× ×× ××¦× \n http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
msgid "WebM file (640p; VP8/Vorbis)"
@@ -823,19 +873,19 @@ msgstr "×××ת ××××ק ×ת %(title)s?"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr "×××ת ××ס×ר ×ת %(media_title)s ×× %(collection_title)s?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr "×סר"
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21
#, python-format
msgid "%(username)s's collections"
-msgstr ""
+msgstr "××ספ×× ×©× %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28
#, python-format
msgid "%(username)s's collections"
-msgstr ""
+msgstr "××ספ×× ×©× %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
#, python-format
@@ -854,7 +904,7 @@ msgstr "××××× ×©× %(username)s"
msgid ""
"%(username)s's media with tag %(tag)s"
-msgstr ""
+msgstr "×××× ×שת×ש %(username)s ×¢× ×ª××ת %(tag)s"
#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48
#, python-format
@@ -866,30 +916,34 @@ msgstr "××××× ×©× %(username)s"
msgid "â Browsing media by %(username)s"
msgstr "â ×¢××× ××××× ××ת %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr "××סף ת××××"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr "××סף ×ת ת×××× ××"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
-msgstr "×צ×"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
+#: 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 ""
-"Added on
\n"
-" %(date)s
"
-msgstr "××סף ×ת×ר××
\n %(date)s
"
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+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
msgid "Add â%(media_title)sâ to a collection"
-msgstr ""
+msgstr "××סף ×ת â%(media_title)sâ ×× ××סף"
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54
msgid "+"
@@ -968,7 +1022,7 @@ msgstr "×שת×ש ×× ×× ×××× ××××§× (×¢××××)."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:124
msgid "Browse collections"
-msgstr ""
+msgstr "×¢××× ×××ספ××"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:137
#, python-format
@@ -997,7 +1051,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:40
msgid "Add to a collection"
-msgstr ""
+msgstr "××סף ×× ××סף"
#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
@@ -1039,7 +1093,7 @@ msgstr "××©× ××תר"
msgid "Tagged with"
msgstr "×ת×××ת ×¢×"
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr "×× ××× × ××ª× ×קר×× ×ת ק×××¥ ×ת××× ×."
@@ -1069,9 +1123,33 @@ msgid ""
" deleted."
msgstr "×× × ×¨×× ×©×§××× ×¢××× ××ת××ת ××. צר ××!
×× ××ª× ×××× ×©××ת××ת ××× × ××××קת, ××ת×× ×©××¢××× ×©××ª× ××פש ×עת ×××¢×ר ×× × ××ק."
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
-msgstr ""
+msgstr "ת××××"
#: mediagoblin/user_pages/forms.py:25
msgid ""
@@ -1090,7 +1168,7 @@ msgstr "×× × ×××× ×©×רצ×× × ××ס×ר ×ת פר×× ×× ×× ×××
#: mediagoblin/user_pages/forms.py:39
msgid "Collection"
-msgstr ""
+msgstr "××סף"
#: mediagoblin/user_pages/forms.py:40
msgid "-- Select --"
@@ -1100,73 +1178,77 @@ msgstr "-- ××ר --"
msgid "Include a note"
msgstr "××××ת פתק"
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr "××××/× ×¢× ×¤×¨×¡×××"
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr "××פס, ת××××ª× ×××ª× ×¨×ק×."
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr "ת××××ª× ×¤×רס××!"
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr "×× × ×××ק ×ת רש×××ת×× ×× ×¡× ×©××."
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr "×¢××× ××××ר ×× ×××ס××£ ××סף"
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "\"%s\" ××ר ק××× ×××סף \"%s\""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "\"%s\" ×ת××סף ×× ×××סף \"%s\""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr "××קת ×ת ×××× ××."
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "××××× ×× × ×××§× ×××××× ×©×× ×¡××× ×ª ש××ª× ××××."
-#: mediagoblin/user_pages/views.py:301
+#: mediagoblin/user_pages/views.py:296
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "××רת ××××ק ×××× ×©× ×שת×ש ××ר. ×××©× ××××ר×ת."
-#: mediagoblin/user_pages/views.py:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr "××קת ×ת ×פר×× ×× ××סף ××."
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
msgid "The item was not removed because you didn't check that you were sure."
msgstr "×פר×× ×× ××סר ×××××× ×©×× ×¡××× ×ª ש××ª× ××××."
-#: mediagoblin/user_pages/views.py:389
+#: mediagoblin/user_pages/views.py:382
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr "××רת ××××ק פר×× ×× ××סף ×©× ×שת×ש ××ר. ×××©× ××××ר×ת."
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "××קת ×ת ×××סף \"%s\""
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr "×××סף ×× ××סר ×××××× ×©×× ×¡××× ×ª ש××ª× ××××."
-#: mediagoblin/user_pages/views.py:439
+#: mediagoblin/user_pages/views.py:430
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 d9addaa6..d22f6ee6 100644
Binary files a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po
index 73180e86..c9f814fc 100644
--- a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# Aleksandr Brezhnev , 2012.
-# Emilio Sepúlveda , 2011.
+# Aleksandr Brezhnev , 2012
+# 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-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-05 00:04+0000\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+0000\n"
"Last-Translator: cwebber \n"
-"Language-Team: LANGUAGE \n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/mediagoblin/language/ia/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -20,34 +20,39 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "Nomine de usator"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
msgid "Password"
msgstr "Contrasigno"
-#: mediagoblin/auth/forms.py:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "Adresse de e-posta"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr ""
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:33
+msgid "This field requires an email address."
+msgstr ""
+
#: mediagoblin/auth/views.py:54
msgid "Sorry, registration is disabled on this instance."
msgstr ""
@@ -60,54 +65,54 @@ msgstr ""
msgid "Sorry, a user with that email address already exists."
msgstr ""
-#: mediagoblin/auth/views.py:174
+#: mediagoblin/auth/views.py:182
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr ""
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
msgstr ""
-#: mediagoblin/auth/views.py:198
+#: mediagoblin/auth/views.py:206
msgid "You must be logged in so we know who to send the email to!"
msgstr ""
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr ""
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr ""
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -118,7 +123,7 @@ msgid "Description of this work"
msgstr ""
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -134,11 +139,11 @@ msgstr "Etiquettas"
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr ""
@@ -166,45 +171,45 @@ msgid "This address contains errors"
msgstr ""
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:64
-msgid "Enter your old password to prove you own this account."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:67
-msgid "New password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:82
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr ""
-#: mediagoblin/edit/forms.py:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:103
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:101
+msgid "Enter your old password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:104
+msgid "New password"
+msgstr ""
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr ""
@@ -229,44 +234,63 @@ msgstr ""
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr ""
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:343
+#: mediagoblin/edit/views.py:329
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr ""
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr ""
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
@@ -274,12 +298,16 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr ""
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr ""
@@ -346,7 +374,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr ""
@@ -365,7 +393,7 @@ msgstr ""
msgid "Add"
msgstr ""
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr ""
@@ -373,45 +401,45 @@ msgstr ""
msgid "File"
msgstr "File"
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr ""
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr ""
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -419,72 +447,25 @@ msgstr ""
msgid "Media processing panel"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr ""
@@ -590,6 +571,53 @@ msgid ""
"%(verification_url)s"
msgstr ""
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+msgid "Don't have one yet? It's easy!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
+#, python-format
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -602,13 +630,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr ""
@@ -625,12 +653,22 @@ msgstr "Cancellar"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -641,7 +679,7 @@ msgid "Yes, really delete my account"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr ""
@@ -658,7 +696,11 @@ msgstr ""
msgid "Changing %(username)s's account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr ""
@@ -683,6 +725,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/video.html:55
msgid "Download"
@@ -707,6 +750,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr ""
@@ -715,6 +759,7 @@ msgstr ""
msgid "WebM file (Vorbis codec)"
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
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -725,6 +770,10 @@ msgstr ""
msgid "Image for %(media_title)s"
msgstr ""
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr ""
@@ -823,7 +872,7 @@ msgstr ""
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr ""
@@ -866,23 +915,27 @@ msgstr ""
msgid "â Browsing media by %(username)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
+#: 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 ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
-#, python-format
-msgid ""
-"Added on
\n"
-" %(date)s
"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+msgid "Added"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
+msgid "Created"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
@@ -1039,7 +1092,7 @@ msgstr ""
msgid "Tagged with"
msgstr ""
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr ""
@@ -1069,6 +1122,30 @@ msgid ""
" deleted."
msgstr ""
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr ""
@@ -1100,73 +1177,77 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr ""
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr ""
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr ""
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr ""
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
msgid "The media was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:301
+#: mediagoblin/user_pages/views.py:296
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:389
+#: mediagoblin/user_pages/views.py:382
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:439
+#: mediagoblin/user_pages/views.py:430
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 376aace4..2fb3a8ce 100644
Binary files a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po
index 1b298a64..81ca3838 100644
--- a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# , 2012.
+# tryggvib , 2012
+# tryggvib , 2013
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-05 00:04+0000\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+0000\n"
"Last-Translator: cwebber \n"
-"Language-Team: LANGUAGE \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"
"Content-Transfer-Encoding: 8bit\n"
@@ -19,34 +20,39 @@ msgstr ""
"Language: is_IS\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "Notandanafn"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
msgid "Password"
msgstr "Lykilorð"
-#: mediagoblin/auth/forms.py:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "Netfang"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr "Notandanafn eða netfang"
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr "Ãgilt notandanafn eða netfang"
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr "Ãessi reitur tekur ekki við netföngum."
+
+#: mediagoblin/auth/tools.py:33
+msgid "This field requires an email address."
+msgstr "à þennan reit verður að slá inn netfang."
+
#: 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."
@@ -59,54 +65,54 @@ msgstr "Ãvà miður er nú þegar til notandi með þetta nafn."
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:174
+#: mediagoblin/auth/views.py:182
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:180
+#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
msgstr "Staðfestingarlykillinn eða notendaauðkennið er rangt"
-#: mediagoblin/auth/views.py:198
+#: mediagoblin/auth/views.py:206
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:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr "Ãú hefur staðfest netfangið þitt!"
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "Endursendi staðfestingartölvupóst"
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
-msgstr ""
+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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
-msgstr ""
+msgstr "Gat ekki fundið neinn með þetta notandanafn."
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
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:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
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:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -117,7 +123,7 @@ msgid "Description of this work"
msgstr "Lýsing á þessu efni"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -133,11 +139,11 @@ msgstr "Efnisorð"
msgid "Separate tags by commas."
msgstr "Aðskildu efnisorðin með kommum."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Vefslóðarormur"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "Vefslóðarormurinn getur ekki verið tómur"
@@ -165,45 +171,45 @@ msgid "This address contains errors"
msgstr "Ãetta netfang inniheldur villur"
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr "Gamla lykilorðið"
-
-#: mediagoblin/edit/forms.py:64
-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:67
-msgid "New password"
-msgstr "Nýtt lykilorð"
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
-msgstr ""
+msgstr "Leyfiskjörstilling"
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
-msgstr ""
+msgstr "Ãetta verður sjálfgefna leyfið þegar þú vilt hlaða upp efni."
-#: mediagoblin/edit/forms.py:82
+#: 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:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr "Ãessi titill getur verið innihaldslaus"
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 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:103
+#: mediagoblin/edit/forms.py:92
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/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr "Gamla lykilorðið"
+
+#: mediagoblin/edit/forms.py:101
+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
+msgid "New password"
+msgstr "Nýtt lykilorð"
+
+#: mediagoblin/edit/views.py:67
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."
@@ -218,7 +224,7 @@ msgstr "Ãú bættir við viðhenginu %s!"
#: mediagoblin/edit/views.py:182
msgid "You can only edit your own profile."
-msgstr ""
+msgstr "Ãú getur bara breytt þinni eigin kenniskrá."
#: mediagoblin/edit/views.py:188
msgid "You are editing a user's profile. Proceed with caution."
@@ -228,57 +234,80 @@ msgstr "Ãú ert að breyta kenniskrá notanda. Farðu mjög varlega."
msgid "Profile changes saved"
msgstr "Breytingar á kenniskrá vistaðar"
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr "Vitlaust lykilorð"
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr "Aðgangsstillingar vistaðar"
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
-msgstr ""
+msgstr "Ãú verður að samþykkja eyðingu á notandaaðganginum þÃnum."
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Ãú hefur nú þegar albúm sem kallast \"%s\"!"
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
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:343
+#: mediagoblin/edit/views.py:329
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/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr "Vitlaust lykilorð"
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr "Get ekki hlekkjað à þema... ekkert þema stillt\n"
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr "Engin eignamappa fyrir þetta þema\n"
-#: mediagoblin/gmg_commands/theme.py:74
+#: 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"
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
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 ""
+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."
-#: mediagoblin/media_types/__init__.py:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr "Ãg styð þvà miður ekki þessa gerð af skrám :("
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr "Myndbandsþverkótun mistókst"
@@ -345,17 +374,17 @@ 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:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr "Biðlarinn {0} hefur verið skráður!"
#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22
msgid "OAuth client connections"
-msgstr ""
+msgstr "Biðlarartengingar OAuth"
#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22
msgid "Your OAuth clients"
-msgstr ""
+msgstr "OAuth-biðlararnir þÃnir"
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
@@ -364,7 +393,7 @@ msgstr ""
msgid "Add"
msgstr "Bæta við"
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr "Ãgild skrá gefin fyrir þessa margmiðlunartegund."
@@ -372,45 +401,45 @@ msgstr "Ãgild skrá gefin fyrir þessa margmiðlunartegund."
msgid "File"
msgstr "Skrá"
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr "Ãú verður að gefa upp skrá."
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr "Jibbà jei! Ãað tókst að senda inn!"
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr "Albúmið \"%s\" var búið til!"
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr "Staðfestu netfangið þitt!"
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr "útskrá"
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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áning"
+msgstr "Innskrá"
-#: mediagoblin/templates/mediagoblin/base.html:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
-msgstr "Notandaaðgangur %(user_name)s"
+msgstr "Notandaaðgangur: %(user_name)s"
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr "Breyta stillingum notandaaðgangs"
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -418,72 +447,25 @@ msgstr "Breyta stillingum notandaaðgangs"
msgid "Media processing panel"
msgstr "Margmiðlunarvinnsluskiki"
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
-msgstr ""
+msgstr "Skrá út"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Senda inn efni"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "Búa til nýtt albúm"
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr "Gefið út undir AGPL. Frumkóti aðgengilegur."
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr "Mynd af durt à stresskasti"
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr "Skoða"
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "Hæ! Gakktu à bæinn á þetta MediaGoblin vefsvæði!"
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr "Ãetta vefsvæði keyrira á MediaGoblin sem er ótrúlega frábær hugbúnaður til að geyma margmiðlunarefni."
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-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/root.html:38
-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/root.html:39
-#, python-format
-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\n eða\n Settu upp þinn eigin margmiðlunarþjón"
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr "Nýlegt efni"
@@ -589,6 +571,53 @@ msgid ""
"%(verification_url)s"
msgstr "Hæ %(username)s,\n\ntil að virkja GNU MediaGoblin aðganginn þinn, opnaðu þá eftirfarandi vefslóði Ã\nvafranum þÃnum:\n\n%(verification_url)s"
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr "Keyrt af MediaGoblin, sem er GNU verkefni."
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr "Gefið út undir AGPL. Frumkóti aðgengilegur."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr "Skoða"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "Hæ! Gakktu à bæinn á þetta MediaGoblin vefsvæði!"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr "Ãetta vefsvæði keyrir á MediaGoblin sem er ótrúlega frábær hugbúnaður til að geyma margmiðlunarefni."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+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
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -601,13 +630,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:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr "Viðhengi"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr "Bæta við viðhengi"
@@ -624,23 +653,33 @@ 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:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
-msgstr ""
+msgstr "Virkilega eyða notanda '%(user_name)s' og tengt efni/athugasemdir?"
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35
msgid "Yes, really delete my account"
-msgstr ""
+msgstr "Já, ég vil örugglega eyða aðganginum mÃnum"
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "Eytt algjörlega"
@@ -657,10 +696,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:59
-msgid "Delete my account"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+msgid "Delete my account"
+msgstr "Eyða aðganginum mÃnum"
+
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
@@ -682,6 +725,7 @@ 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/video.html:55
msgid "Download"
@@ -706,6 +750,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/video.html:61
msgid "Original file"
msgstr "Upphaflega skráin"
@@ -714,6 +759,7 @@ msgstr "Upphaflega skráin"
msgid "WebM file (Vorbis codec)"
msgstr "WebM skrá (Vorbis vÃxlþjöppun)"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -724,6 +770,10 @@ 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
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr "Stilla snúning af eða á"
@@ -769,14 +819,14 @@ msgid ""
"Sorry, this video will not work because\n"
" your web browser does not support HTML5 \n"
" video."
-msgstr ""
+msgstr "Ãvà miður mun þetta myndband 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 ""
+msgstr "Ãú getur náð à nýlegan vafra sem \n sem getur spilað myndbandið á \n http://getfirefox.com!"
#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
msgid "WebM file (640p; VP8/Vorbis)"
@@ -822,19 +872,19 @@ msgstr "Virkilega eyða %(title)s?"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr "Virkilega fjarlægja %(media_title)s úr %(collection_title)s albúminu?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr "Fjarlægja"
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21
#, python-format
msgid "%(username)s's collections"
-msgstr ""
+msgstr "Albúm sem %(username)s á"
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28
#, python-format
msgid "%(username)s's collections"
-msgstr ""
+msgstr "Albúm sem %(username)s á"
#: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
#, python-format
@@ -853,7 +903,7 @@ msgstr "Efni sem %(username)s á"
msgid ""
"%(username)s's media with tag %(tag)s"
-msgstr ""
+msgstr "Efni sem %(username)s á og er merkt með %(tag)s"
#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48
#, python-format
@@ -865,30 +915,34 @@ 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:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr "Bæta við athugasemd"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr "Senda inn þessa athugasemd"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
-msgstr "hjá"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
+#: 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 ""
-"Added on
\n"
-" %(date)s
"
-msgstr "Bætt við:
\n %(date)s
"
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+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
msgid "Add â%(media_title)sâ to a collection"
-msgstr ""
+msgstr "Setja '%(media_title)s' à albúm"
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54
msgid "+"
@@ -967,7 +1021,7 @@ msgstr "Ãessi notandi hefur ekki fyllt inn à upplýsingar um sig (ennþá)."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:124
msgid "Browse collections"
-msgstr ""
+msgstr "Skoða albúm"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:137
#, python-format
@@ -992,11 +1046,11 @@ msgstr "(fjarlægja)"
#: mediagoblin/templates/mediagoblin/utils/collections.html:21
msgid "Collected in"
-msgstr ""
+msgstr "Sett à albúm"
#: mediagoblin/templates/mediagoblin/utils/collections.html:40
msgid "Add to a collection"
-msgstr ""
+msgstr "Setja à albúm"
#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
@@ -1038,7 +1092,7 @@ msgstr "eldri"
msgid "Tagged with"
msgstr "Merkt með"
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr "Gat ekki lesið myndskrána."
@@ -1068,9 +1122,33 @@ msgid ""
" deleted."
msgstr "Ãvà miður! Ãað virðist ekki vera nein sÃða á þessari vefslóð.
Ef þú ert viss um að vefslóðin sé rétt hefur vefsÃðan sem þú ert að leita að kannski verið flutt eða fjarlægð."
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
-msgstr ""
+msgstr "Athugasemd"
#: mediagoblin/user_pages/forms.py:25
msgid ""
@@ -1089,7 +1167,7 @@ msgstr "Ãg er viss um að ég vilji fjarlægja þetta efni úr albúminu"
#: mediagoblin/user_pages/forms.py:39
msgid "Collection"
-msgstr ""
+msgstr "Albúm"
#: mediagoblin/user_pages/forms.py:40
msgid "-- Select --"
@@ -1099,73 +1177,77 @@ msgstr "-- Velja --"
msgid "Include a note"
msgstr "Bæta við minnispunktum"
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr "skrifaði athugasemd við færsluna þÃna"
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr "ObbosÃ! Athugasemdin þÃn var innihaldslaus."
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr "Athugasemdin þÃn var skráð!"
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr "Vinsamlegast kÃktu á innsendingarnar þÃnar og reyndu aftur."
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
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:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "\"%s\" er nú þegar à albúminu \"%s\""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "\"%s\" sett à albúmið \"%s\""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr "Ãú eyddir þessu efni."
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
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:301
+#: mediagoblin/user_pages/views.py:296
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:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr "Ãú tókst þetta efni úr albúminu."
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
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:389
+#: mediagoblin/user_pages/views.py:382
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:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "Ãú eyddir albúminu \"%s\""
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
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:439
+#: mediagoblin/user_pages/views.py:430
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 62451511..62575b62 100644
Binary files a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po
index e13345a7..c782fc62 100644
--- a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po
@@ -3,18 +3,19 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# Francesco Apruzzese , 2012.
-# , 2011.
-# , 2011.
-# , 2012.
+# Francesco Apruzzese , 2012
+# gdb , 2013
+# pikappa469 , 2011
+# nunni , 2011
+# Damtux , 2012
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-05 00:04+0000\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+0000\n"
"Last-Translator: cwebber \n"
-"Language-Team: LANGUAGE \n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/mediagoblin/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -22,34 +23,39 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "Nome utente"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
msgid "Password"
msgstr "Password"
-#: mediagoblin/auth/forms.py:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "Indirizzo email"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr "Nome utente o indirizzo email"
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:33
+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."
@@ -62,54 +68,54 @@ msgstr "Spiacente, esiste già un utente con quel nome."
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:174
+#: mediagoblin/auth/views.py:182
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:180
+#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
msgstr "La chiave di verifica o l'id utente è sbagliato"
-#: mediagoblin/auth/views.py:198
+#: mediagoblin/auth/views.py:206
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:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr "Hai già verificato il tuo indirizzo email!"
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "Rispedisci email di verifica"
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
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:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
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:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -120,7 +126,7 @@ msgid "Description of this work"
msgstr "Descrizione di questo lavoro"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -136,11 +142,11 @@ msgstr "Tags"
msgid "Separate tags by commas."
msgstr "Separa le tags con la virgola."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr ""
@@ -168,45 +174,45 @@ msgid "This address contains errors"
msgstr "Questo indirizzo contiene errori"
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr "Password vecchia"
-
-#: mediagoblin/edit/forms.py:64
-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:67
-msgid "New password"
-msgstr "Nuova password"
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:82
+#: 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:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:103
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr "Password vecchia"
+
+#: mediagoblin/edit/forms.py:101
+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
+msgid "New password"
+msgstr "Nuova password"
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr ""
@@ -231,44 +237,63 @@ msgstr "Stai modificando il profilo di un utente. Procedi con attenzione."
msgid "Profile changes saved"
msgstr "Cambiamenti del profilo salvati"
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr "Password errata"
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr "Impostazioni del profilo salvate"
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:343
+#: mediagoblin/edit/views.py:329
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr "Password errata"
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr ""
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
@@ -276,12 +301,16 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr "Mi dispiace, non supporto questo tipo di file :("
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr "Transcodifica video fallita"
@@ -348,7 +377,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr ""
@@ -367,7 +396,7 @@ msgstr ""
msgid "Add"
msgstr "Aggiungi"
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr "File non valido per il tipo di file multimediale indicato."
@@ -375,45 +404,45 @@ msgstr "File non valido per il tipo di file multimediale indicato."
msgid "File"
msgstr "File"
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr "Devi specificare un file."
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr "Evviva! Caricato!"
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr "Verifica la tua email!"
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr "Cambia le impostazioni dell'account"
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -421,72 +450,25 @@ msgstr "Cambia le impostazioni dell'account"
msgid "Media processing panel"
msgstr "Pannello di elaborazione files multimediali"
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Aggiungi files multimediali"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr "Rilasciato con licenza AGPL. Codice sorgente disponibile."
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr "Esplora"
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "Ciao, benvenuto in questo sito MediaGoblin!"
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr "Questo sito sta utilizzando Mediagoblin, un ottimo programma per caricare e condividere files multimediali."
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
-msgstr "Per aggiungere i tuoi file multimediali, scrivere commenti e altro puoi accedere con il tuo account MediaGoblin."
-
-#: mediagoblin/templates/mediagoblin/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr "Non ne hai già uno? E' semplice!"
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "Crea un account in questo sito\n oppure\n Installa MediaGoblin sul tuo server"
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr "Files multimediali più recenti"
@@ -592,6 +574,53 @@ msgid ""
"%(verification_url)s"
msgstr "Ciao %(username)s,\n\nper attivare il tuo account GNU MediaGoblin, apri il seguente URL nel \ntuo navigatore web.\n\n%(verification_url)s"
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr "Rilasciato con licenza AGPL. Codice sorgente disponibile."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr "Esplora"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "Ciao, benvenuto in questo sito MediaGoblin!"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr "Questo sito sta utilizzando Mediagoblin, un ottimo programma per caricare e condividere files multimediali."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+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
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -604,13 +633,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:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr "Allegati"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr "Aggiungi allegato"
@@ -627,12 +656,22 @@ msgstr "Annulla"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -643,7 +682,7 @@ msgid "Yes, really delete my account"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "Elimina definitivamente"
@@ -660,7 +699,11 @@ 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:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr ""
@@ -685,6 +728,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/video.html:55
msgid "Download"
@@ -709,6 +753,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/video.html:61
msgid "Original file"
msgstr "File originario"
@@ -717,6 +762,7 @@ msgstr "File originario"
msgid "WebM file (Vorbis codec)"
msgstr "File WebM (codec Vorbis)"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -727,6 +773,10 @@ msgstr "File WebM (codec Vorbis)"
msgid "Image for %(media_title)s"
msgstr ""
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr ""
@@ -753,7 +803,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
msgid "WebGL"
-msgstr ""
+msgstr "WebGL"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
msgid "Download model"
@@ -825,7 +875,7 @@ msgstr "Vuoi davvero eliminare %(title)s?"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr ""
@@ -868,24 +918,28 @@ 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:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr "Aggiungi un commento"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr "Aggiungi questo commento"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
-msgstr "a"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
+#: 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 ""
-"Added on
\n"
-" %(date)s
"
-msgstr "Aggiunto il
\n %(date)s
"
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+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
@@ -1041,7 +1095,7 @@ msgstr "più vecchio"
msgid "Tagged with"
msgstr "Taggato con"
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr "Impossibile leggere il file immagine."
@@ -1071,6 +1125,30 @@ msgid ""
" deleted."
msgstr ""
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr ""
@@ -1102,73 +1180,77 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr "ha commentato il tuo post"
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr "Oops, il tuo commento era vuoto."
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr "Il tuo commento è stato aggiunto!"
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr "Hai eliminato il file."
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
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:301
+#: mediagoblin/user_pages/views.py:296
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:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:389
+#: mediagoblin/user_pages/views.py:382
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:439
+#: mediagoblin/user_pages/views.py:430
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 1344c9bd..3c82d1ff 100644
Binary files a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po
index 008a6d27..97d68127 100644
--- a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# , 2011.
-# , 2013.
+# Avery , 2011
+# parlegon , 2013
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-05 00:04+0000\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+0000\n"
"Last-Translator: cwebber \n"
-"Language-Team: LANGUAGE \n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/mediagoblin/language/ja/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -20,34 +20,39 @@ msgstr ""
"Language: ja\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "ã¦ã¼ã¶ãã¼ã "
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
msgid "Password"
msgstr "ãã¹ã¯ã¼ã"
-#: mediagoblin/auth/forms.py:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "ã¡ã¼ã«ã¢ãã¬ã¹"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr ""
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:33
+msgid "This field requires an email address."
+msgstr ""
+
#: mediagoblin/auth/views.py:54
msgid "Sorry, registration is disabled on this instance."
msgstr "ç³ã訳ããã¾ãããããã®ã¤ã³ã¹ã¿ã³ã¹ã§ç»é²ã¯ç¡å¹ã«ãªã£ã¦ãã¾ãã"
@@ -60,54 +65,54 @@ msgstr "ç³ã訳ããã¾ãããããã®ååãæã¤ã¦ã¼ã¶ã¼ããã§
msgid "Sorry, a user with that email address already exists."
msgstr ""
-#: mediagoblin/auth/views.py:174
+#: mediagoblin/auth/views.py:182
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "ã¡ã¢ãã確èªããã¦ãã¾ããããã§ããã°ã¤ã³ãã¦ãããã¡ã¤ã«ãç·¨éããç»åãæåºãããã¨ãã§ãã¾ãï¼"
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
msgstr "æ¤è¨¼ãã¼ã¾ãã¯ã¦ã¼ã¶ã¼IDãééã£ã¦ãã¾ã"
-#: mediagoblin/auth/views.py:198
+#: mediagoblin/auth/views.py:206
msgid "You must be logged in so we know who to send the email to!"
msgstr ""
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr ""
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "æ¤è¨¼ã¡ã¼ã«ãåéãã¾ããã"
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -118,7 +123,7 @@ msgid "Description of this work"
msgstr ""
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -134,11 +139,11 @@ msgstr "ã¿ã°"
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "ã¹ã©ã°"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "ã¹ã©ã°ã¯å¿
è¦ã§ãã"
@@ -166,45 +171,45 @@ msgid "This address contains errors"
msgstr ""
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:64
-msgid "Enter your old password to prove you own this account."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:67
-msgid "New password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:82
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr ""
-#: mediagoblin/edit/forms.py:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:103
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:101
+msgid "Enter your old password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:104
+msgid "New password"
+msgstr ""
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr "ãã®ã¹ã©ã°ãæã¤ã¨ã³ããªã¯ããã®ã¦ã¼ã¶ã¼ã¯æ¢ã«åå¨ãã¾ãã"
@@ -229,44 +234,63 @@ msgstr "ããªãã¯ãä»ã®ã¦ã¼ã¶ã¼ã®ãããã¡ã¤ã«ãç·¨éãã¦ã
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr ""
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:343
+#: mediagoblin/edit/views.py:329
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr ""
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr ""
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
@@ -274,12 +298,16 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr ""
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr ""
@@ -346,7 +374,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr ""
@@ -365,7 +393,7 @@ msgstr ""
msgid "Add"
msgstr "追å "
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr ""
@@ -373,45 +401,45 @@ msgstr ""
msgid "File"
msgstr "ãã¡ã¤ã«"
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr "ãã¡ã¤ã«ãæä¾ããå¿
è¦ãããã¾ãã"
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr "æ稿çµäºï¼"
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -419,72 +447,25 @@ msgstr ""
msgid "Media processing panel"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "ããã«ã¡ã¯ããã®MediaGoblinãµã¤ãã¸ããããï¼"
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr ""
@@ -590,6 +571,53 @@ msgid ""
"%(verification_url)s"
msgstr "%(username)sæ§ã¸\n\nGNU MediaGoblinã¢ã«ã¦ã³ããæ¤è¨¼ã«ããã«ã¯ããã®URLãéãã¦ãã ããã\n\n%(verification_url)s"
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "ããã«ã¡ã¯ããã®MediaGoblinãµã¤ãã¸ããããï¼"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+msgid "Don't have one yet? It's easy!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
+#, python-format
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -602,13 +630,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr ""
@@ -625,12 +653,22 @@ msgstr "ãã£ã³ã»ã«"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -641,7 +679,7 @@ msgid "Yes, really delete my account"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr ""
@@ -658,7 +696,11 @@ msgstr "%(media_title)sãç·¨éä¸"
msgid "Changing %(username)s's account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr ""
@@ -683,6 +725,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/video.html:55
msgid "Download"
@@ -707,6 +750,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr ""
@@ -715,6 +759,7 @@ msgstr ""
msgid "WebM file (Vorbis codec)"
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
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -725,6 +770,10 @@ msgstr ""
msgid "Image for %(media_title)s"
msgstr ""
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr ""
@@ -823,7 +872,7 @@ msgstr ""
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr ""
@@ -866,23 +915,27 @@ msgstr "%(username)sããã®ã³ã³ãã³ã"
msgid "â Browsing media by %(username)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
+#: 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 ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
-#, python-format
-msgid ""
-"Added on
\n"
-" %(date)s
"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+msgid "Added"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
+msgid "Created"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
@@ -1039,7 +1092,7 @@ msgstr ""
msgid "Tagged with"
msgstr ""
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr ""
@@ -1069,6 +1122,30 @@ msgid ""
" deleted."
msgstr ""
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr ""
@@ -1100,73 +1177,77 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr ""
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr ""
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr ""
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr ""
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
msgid "The media was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:301
+#: mediagoblin/user_pages/views.py:296
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:389
+#: mediagoblin/user_pages/views.py:382
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:439
+#: mediagoblin/user_pages/views.py:430
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 69bf72bc..7d37ab7c 100644
Binary files a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po
index ac87c90f..5333de02 100644
--- a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# , 2012.
+# Jin-hoon Kim , 2012
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-05 00:04+0000\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+0000\n"
"Last-Translator: cwebber \n"
-"Language-Team: LANGUAGE \n"
+"Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/mediagoblin/language/ko_KR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -19,34 +19,39 @@ msgstr ""
"Language: ko_KR\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "ì¬ì©ì ì´ë¦"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
msgid "Password"
msgstr "ë¹ë°ë²í¸"
-#: mediagoblin/auth/forms.py:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "email 주ì"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr "ì¬ì©ì ì´ë¦ ëë email"
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:33
+msgid "This field requires an email address."
+msgstr ""
+
#: mediagoblin/auth/views.py:54
msgid "Sorry, registration is disabled on this instance."
msgstr "ì£ì¡í©ëë¤. ì§ê¸ì ê°ì
íì¤ ì ììµëë¤."
@@ -59,54 +64,54 @@ msgstr "ì£ì¡í©ëë¤. í´ë¹ ì¬ì©ì ì´ë¦ì´ ì´ë¯¸ ì¡´ì¬ í©ëë¤."
msgid "Sorry, a user with that email address already exists."
msgstr "ì£ì¡í©ëë¤. ì¬ì©ìì í´ë¹ ì´ë©ì¼ì ì´ë¯¸ ë±ë¡ëì´ ììµëë¤."
-#: mediagoblin/auth/views.py:174
+#: mediagoblin/auth/views.py:182
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "í´ë¹ email 주ìê° ì´ë¯¸ ì¸ì¦ ëì´ ììµëë¤. ì§ê¸ ë¡ê·¸ì¸íìê³ ê³ì ì 보를 ìì íê³ ì¬ì§ì ì ì¡í´ ë³´ì¸ì!"
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
msgstr "ì¸ì¦ í¤ ëë ì¬ì©ì IDê° ì¬ë°ë¥´ì§ ììµëë¤."
-#: mediagoblin/auth/views.py:198
+#: mediagoblin/auth/views.py:206
msgid "You must be logged in so we know who to send the email to!"
msgstr "ë¡ê·¸ì¸ì íì
ì¼ ê³ ë¸ë¦°ìì ë©ì¼ì ë³´ë¼ ì ììµëë¤!"
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr "ì´ë¯¸ ì¸ì¦ë°ì email 주ì를 ê°ì§ê³ ììµëë¤!"
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "ì¸ì¦ ë©ì¼ì ë¤ì ë³´ë´ ì£¼ì¸ì."
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "ë¹ë°ë²í¸ë¥¼ ë³ê²½íë ë°©ë²ì ëí ì¤ëª
ìê° ë©ì¼ë¡ ì ì¡ ëììµëë¤."
-#: mediagoblin/auth/views.py:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
msgid "You can now log in using your new password."
msgstr "ì´ì ìë¡ì´ ë¹ë°ë²í¸ë¡ ë¡ê·¸ì¸ íì¤ ì ììµëë¤."
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -117,7 +122,7 @@ msgid "Description of this work"
msgstr "ì´ ìì
ì ëí ì¤ëª
"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -133,11 +138,11 @@ msgstr "íê·¸"
msgid "Separate tags by commas."
msgstr "íê·¸ë , ë¡ êµ¬ë¶ ë©ëë¤."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "'ì¬ë¬ê·¸'"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "'ì¬ë¬ê·¸'ë ê³µë°±ì¼ ì ììµëë¤."
@@ -165,45 +170,45 @@ msgid "This address contains errors"
msgstr "주ìì ìë¬ê° ììµëë¤."
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr "ìì ë¹ë°ë²í¸"
-
-#: mediagoblin/edit/forms.py:64
-msgid "Enter your old password to prove you own this account."
-msgstr "ê³ì íì¸ì ìí´, ì´ì ë¹ë° ë²í¸ë¥¼ ì
ë ¥í´ ì£¼ì¸ì."
-
-#: mediagoblin/edit/forms.py:67
-msgid "New password"
-msgstr "ìë¡ì´ ë¹ë°ë²í¸"
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:82
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr "ì 미ëì´ì ëí 컨í
ì ìíë¤ë©´, ë©ì¼ì ë³´ë´ì£¼ì¸ì."
-#: mediagoblin/edit/forms.py:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr "ì 목ì ê³µë°±ì¼ ì ììµëë¤."
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "모ìì§ì ëí ì¤ëª
"
-#: mediagoblin/edit/forms.py:103
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr "ìì ë¹ë°ë²í¸"
+
+#: mediagoblin/edit/forms.py:101
+msgid "Enter your old password to prove you own this account."
+msgstr "ê³ì íì¸ì ìí´, ì´ì ë¹ë° ë²í¸ë¥¼ ì
ë ¥í´ ì£¼ì¸ì."
+
+#: mediagoblin/edit/forms.py:104
+msgid "New password"
+msgstr "ìë¡ì´ ë¹ë°ë²í¸"
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr "í´ë¹ ì ì ì ëí 'ì¬ë¬ê·¸'ê° ì´ë¯¸ ì¡´ì¬í©ëë¤."
@@ -228,44 +233,63 @@ msgstr "ì¬ì©ìì ê³ì ì 보를 ìì íê³ ììµëë¤. ì¡°ì¬í´ì
msgid "Profile changes saved"
msgstr "ê³ì ì ë³´ê° ì ì¥ ëììµëë¤."
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr "ì못ë ë¹ë°ë²í¸"
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr "ê³ì ì¤ì ì´ ì ì¥ ëììµëë¤."
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "\"%s\" 모ìì§ì ì´ë¯¸ ê°ì§ê³ ììµëë¤!"
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:343
+#: mediagoblin/edit/views.py:329
msgid "You are editing another user's collection. Proceed with caution."
msgstr "ë¤ë¥¸ ì ì ì 모ìì§ì ìì ì¤ ì
ëë¤. 주ìíì¸ì."
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr "ì못ë ë¹ë°ë²í¸"
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr "í
ë§ì ì°ê²°í ì ììµëë¤... í
ë§ ì
ì´ ììµëë¤.\n"
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr "ì´ í
ë§ë¥¼ ìí ìì
ëë í ë¦¬ê° ììµëë¤.\n"
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr "ê·¸ë°ë°, ì¤ëë ëë í 리 ì¬ë³¼ë¦ ë§í¬ë¥¼ ì°¾ììµëë¤; ì§ìì¡ìµëë¤.\n"
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
@@ -273,12 +297,16 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr "ì£ì¡í©ëë¤. í´ë¹ íì
ì íì¼ì ì§ìíì§ ììì :("
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr "ë¹ëì¤ ë³íì ì¤í¨ íìµëë¤."
@@ -345,7 +373,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr "ì´ í목ì ê³µê° ì¬ì©ìë¤ì ìí´ ê¼ íì í©ëë¤."
-#: mediagoblin/plugins/oauth/views.py:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr "ì¬ì©ì {0}ëì´ ë±ë¡ ëììµëë¤!"
@@ -364,7 +392,7 @@ msgstr ""
msgid "Add"
msgstr "ì¶ê°"
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr "ìììë 미ëì´ íì¼ ì
ëë¤."
@@ -372,45 +400,45 @@ msgstr "ìììë 미ëì´ íì¼ ì
ëë¤."
msgid "File"
msgstr "íì¼"
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr "íì¼ì ë±ë¡íì
ì¼ í©ëë¤."
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr "ì´í!! ë±ë¡íìµëë¤!"
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr "\"%s\" 모ìì§ì´ ì¶ê°ëììµëë¤!"
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr "ë©ì¼ì íì¸íì¸ì!"
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr "ê³ì ì¤ì ë³ê²½"
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -418,72 +446,25 @@ msgstr "ê³ì ì¤ì ë³ê²½"
msgid "Media processing panel"
msgstr "미ëì´ ìì
í¨ë"
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "미ëì´ ì¶ê°"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr "Released under the AGPL. Source code available."
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr "íì"
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "ìë
íì¸ì! 미ëì´ ê³ ë¸ë¦° ì¬ì´í¸ì ì¨ê±¸ íì í©ëë¤!"
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr "ì´ì¬ì´í¸ë MediaGoblinì¼ë¡ ìë ì¤ì
ëë¤. ì´ë í¹ì´í 미ëì´ í¸ì¤í
ìíí¸ì¨ì´ì¤ íë ì
ëë¤."
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
-msgstr "ìì ì 미ëì´ë¥¼ ì¶ê°íê³ , ëê¸ì ë¨ê¸°ì¸ì! 미ëì´ ê³ ë¸ë¦° ê³ì ì¼ë¡ ë´ìì íì¸ íì¤ ì ììµëë¤!"
-
-#: mediagoblin/templates/mediagoblin/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr "ìì§ ì무ê²ë ìì¼ìë¤êµ¬ì? ë§¤ì° ì½ìµëë¤!"
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "ì¬ì©ì ê³ì ë§ë¤ê¸°\n ëë\n ìë²ë¥¼ ìí MediaGoblin ì¤ì í기"
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr "ê°ì¥ ìµê·¼ì ë±ë¡ë 미ëì´"
@@ -589,6 +570,53 @@ msgid ""
"%(verification_url)s"
msgstr "ìë
íì¸ì %(username)së,\n\nGNU MediaGoblin ê³ì ì íì±í íìë ¤ë©´, ìëì URL 주ì를 ë¸ë¼ì°ì ¸ë¡ ì ìíì¸ì.\n\n%(verification_url)s"
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr "Released under the AGPL. Source code available."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr "íì"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "ìë
íì¸ì! 미ëì´ ê³ ë¸ë¦° ì¬ì´í¸ì ì¨ê±¸ íì í©ëë¤!"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr "ì´ì¬ì´í¸ë MediaGoblinì¼ë¡ ìë ì¤ì
ëë¤. ì´ë í¹ì´í 미ëì´ í¸ì¤í
ìíí¸ì¨ì´ì¤ íë ì
ëë¤."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+msgid "Don't have one yet? It's easy!"
+msgstr "ìì§ ì무ê²ë ìì¼ìë¤êµ¬ì? ë§¤ì° ì½ìµëë¤!"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
+#, python-format
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -601,13 +629,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:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr "첨ë¶"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr "ì²¨ë¶ ì¶ê°"
@@ -624,12 +652,22 @@ msgstr "ì·¨ì"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -640,7 +678,7 @@ msgid "Yes, really delete my account"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "ì구ì ì¼ë¡ ìì "
@@ -657,7 +695,11 @@ msgstr "%(media_title)s í¸ì§ì¤..."
msgid "Changing %(username)s's account settings"
msgstr "%(username)s'ì ê³ì ì¤ì ë³ê²½ì¤..."
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr ""
@@ -682,6 +724,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/video.html:55
msgid "Download"
@@ -706,6 +749,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/video.html:61
msgid "Original file"
msgstr "ì본 íì¼"
@@ -714,6 +758,7 @@ msgstr "ì본 íì¼"
msgid "WebM file (Vorbis codec)"
msgstr "WebM íì¼ (Vorbis ì½ë±)"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -724,6 +769,10 @@ msgstr "WebM íì¼ (Vorbis ì½ë±)"
msgid "Image for %(media_title)s"
msgstr "%(media_title)s ì´ë¯¸ì§"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr ""
@@ -822,7 +871,7 @@ msgstr "%(title)s ì ì§ì°ìê² ìµëê¹?"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr "%(collection_title)sì %(media_title)sì ìì íìê² ìµëê¹?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr "ì§ì°ê¸°"
@@ -865,24 +914,28 @@ msgstr "%(username)sì 미ëì´"
msgid "â Browsing media by %(username)s"
msgstr "â %(username)sì 미ëì´ë¥¼ ë³´ê³ ììµëë¤."
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr "ë§ê¸ ë¬ê¸°"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr "ë§ê¸ ì¶ê°"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
-msgstr "ì"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
+#: 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 ""
-"Added on
\n"
-" %(date)s
"
-msgstr "ë¶ê° 기ë¥
\n %(date)s
"
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+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
@@ -1038,7 +1091,7 @@ msgstr "ì´ì "
msgid "Tagged with"
msgstr "íê·¸ ì ë³´"
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr "ì´ë¯¸ì§ íì¼ì ì½ì ì ììµëë¤."
@@ -1068,6 +1121,30 @@ msgid ""
" deleted."
msgstr ""
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr ""
@@ -1099,73 +1176,77 @@ msgstr "-- ì í --"
msgid "Include a note"
msgstr "ë
¸í¸ ì¶ê°"
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr "ê²ì물ì ë§ê¸ì´ ë¬ë ¸ìµëë¤."
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr "ì¤ì°, ëê¸ì´ ë¹ììµëë¤."
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr "ëê¸ì´ ë±ë¡ ëììµëë¤!"
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr "íì¸ì íìê³ ë¤ì ìëíì¸ì."
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr "모ìì§ì ì¶ê°íê±°ë 기존 모ìì§ì ì ííì¸ì."
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "\"%s\" 모ìì§ì´ ì´ë¯¸ ì¡´ì¬ í©ëë¤. \"%s\""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "\"%s\" 모ìì§ì ì¶ê°íìµëë¤. \"%s\""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr "미ëì´ë¥¼ ìì íìµëë¤."
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "íì¸ ì²´í¬ë¥¼ íì§ ìììµëë¤. 미ëì´ë ìì ëì§ ìììµëë¤."
-#: mediagoblin/user_pages/views.py:301
+#: mediagoblin/user_pages/views.py:296
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "ë¤ë¥¸ ì¬ëì 미ëì´ë¥¼ ìì íë ¤ê³ í©ëë¤. ë¤ì íë² íì¸íì¸ì."
-#: mediagoblin/user_pages/views.py:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr "모ìì§ì ìë í목ì ìì íìµëë¤."
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
msgid "The item was not removed because you didn't check that you were sure."
msgstr "íì¸ì íì§ ìììµëë¤. í목ì ìì íì§ ìììµëë¤."
-#: mediagoblin/user_pages/views.py:389
+#: mediagoblin/user_pages/views.py:382
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr "ë¤ë¥¸ ì¬ì©ìì 모ìì§ì ìë í목ì ìì íììµëë¤. 주ìíì¸ì."
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "\"%s\" 모ìì§ì ìì íì
¨ìµëë¤."
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr "íì¸ì íì§ ìììµëë¤. 모ìì§ì ìì íì§ ìììµëë¤."
-#: mediagoblin/user_pages/views.py:439
+#: mediagoblin/user_pages/views.py:430
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 fe96d40e..4e6e51ce 100644
Binary files a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po
index 3fd26d23..14e4fb33 100644
--- a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# , 2011, 2012.
-# , 2012.
+# schendje , 2011, 2012
+# mvanderboom , 2012
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-05 00:04+0000\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+0000\n"
"Last-Translator: cwebber \n"
-"Language-Team: LANGUAGE \n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/mediagoblin/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -20,34 +20,39 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "Gebruikersnaam"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
msgid "Password"
msgstr "Wachtwoord"
-#: mediagoblin/auth/forms.py:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "E-mail adres"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr "Gebruikersnaam of email-adres"
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:33
+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."
@@ -60,54 +65,54 @@ msgstr "Sorry, er bestaat al een gebruiker met die naam."
msgid "Sorry, a user with that email address already exists."
msgstr "Sorry, een gebruiker met dat e-mailadres bestaat al."
-#: mediagoblin/auth/views.py:174
+#: mediagoblin/auth/views.py:182
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:180
+#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
msgstr "De verificatie sleutel of gebruikers-ID is onjuist"
-#: mediagoblin/auth/views.py:198
+#: mediagoblin/auth/views.py:206
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:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr "Je hebt je e-mailadres al geverifieerd!"
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "Verificatie e-mail opnieuw opgestuurd."
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
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:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
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:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -118,7 +123,7 @@ msgid "Description of this work"
msgstr "Beschrijving van dit werk"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -134,11 +139,11 @@ msgstr "Etiket"
msgid "Separate tags by commas."
msgstr "Hou labels gescheiden met komma's."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Slug"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "De slug kan niet leeg zijn"
@@ -166,45 +171,45 @@ msgid "This address contains errors"
msgstr "Dit adres bevat fouten"
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr "Oud wachtwoord"
-
-#: mediagoblin/edit/forms.py:64
-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:67
-msgid "New password"
-msgstr "Nieuw wachtwoord"
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:82
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr ""
-#: mediagoblin/edit/forms.py:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:103
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr "Oud wachtwoord"
+
+#: mediagoblin/edit/forms.py:101
+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
+msgid "New password"
+msgstr "Nieuw wachtwoord"
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr "Er bestaat al een met die slug voor deze gebruiker."
@@ -229,44 +234,63 @@ msgstr "U bent een gebruikersprofiel aan het aanpassen. Ga voorzichtig te werk."
msgid "Profile changes saved"
msgstr "Profielaanpassingen opgeslagen"
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr "Verkeerd wachtwoord"
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr "Accountinstellingen opgeslagen"
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:343
+#: mediagoblin/edit/views.py:329
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr "Verkeerd wachtwoord"
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr ""
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
@@ -274,12 +298,16 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr "Sorry, dat bestandstype wordt niet ondersteunt."
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr ""
@@ -346,7 +374,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr ""
@@ -365,7 +393,7 @@ msgstr ""
msgid "Add"
msgstr "Voeg toe"
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr "Verkeerd bestandsformaat voor mediatype opgegeven."
@@ -373,45 +401,45 @@ msgstr "Verkeerd bestandsformaat voor mediatype opgegeven."
msgid "File"
msgstr "Bestand"
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr "U moet een bestand aangeven."
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr "Mooizo! Toegevoegd!"
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr "Verifieer je e-mailadres!"
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr "Accountinstellingen aanpassen"
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -419,72 +447,25 @@ msgstr "Accountinstellingen aanpassen"
msgid "Media processing panel"
msgstr "Mediaverwerkingspaneel"
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Voeg media toe"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr "Uitgegeven onder de AGPL-licentie. Broncode available."
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr "Verkennen"
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "Hoi, welkom op deze MediaGoblin website!"
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr "Deze website draait MediaGoblin, een buitengewoon goed stuk software voor mediahosting."
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr "Heb je er nog geen? Het is heel eenvoudig!"
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Creëer een account op deze website</a>\n of\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Gebruik MediaGoblin op je eigen server</a>"
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr "Nieuwste media"
@@ -590,6 +571,53 @@ msgid ""
"%(verification_url)s"
msgstr "Hallo %(username)s , open de volgende URL in uw webbrowser om uw GNU MediaGoblin account te activeren: %(verification_url)s "
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr "Uitgegeven onder de AGPL-licentie. Broncode available."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr "Verkennen"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "Hoi, welkom op deze MediaGoblin website!"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr "Deze website draait MediaGoblin, een buitengewoon goed stuk software voor mediahosting."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+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
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -602,13 +630,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr ""
@@ -625,12 +653,22 @@ msgstr "Annuleren"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -641,7 +679,7 @@ msgid "Yes, really delete my account"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "Permanent verwijderen"
@@ -658,7 +696,11 @@ msgstr "%(media_title)s aanpassen"
msgid "Changing %(username)s's account settings"
msgstr "%(username)ss accountinstellingen aanpassen"
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr ""
@@ -683,6 +725,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/video.html:55
msgid "Download"
@@ -707,6 +750,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/video.html:61
msgid "Original file"
msgstr ""
@@ -715,6 +759,7 @@ msgstr ""
msgid "WebM file (Vorbis codec)"
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
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -725,6 +770,10 @@ msgstr ""
msgid "Image for %(media_title)s"
msgstr "Afbeelding voor %(media_title)s"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr ""
@@ -823,7 +872,7 @@ msgstr "Zeker weten dat je %(title)s wil verwijderen?"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr ""
@@ -866,24 +915,28 @@ 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:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr "Geef een reactie"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr "Voeg dit bericht toe"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
-msgstr "op"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
+#: 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 ""
-"Added on
\n"
-" %(date)s
"
-msgstr "Toegevoegd op
\n %(date)s
"
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+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
@@ -1039,7 +1092,7 @@ msgstr "ouder"
msgid "Tagged with"
msgstr "Getagged met"
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr "Kon het afbeeldingsbestand niet lezen."
@@ -1069,6 +1122,30 @@ msgid ""
" deleted."
msgstr ""
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr ""
@@ -1100,73 +1177,77 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr ""
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr "Oeps, je bericht was leeg."
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr "Je bericht is geplaatst!"
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr "Je hebt deze media verwijderd."
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
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:301
+#: mediagoblin/user_pages/views.py:296
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:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:389
+#: mediagoblin/user_pages/views.py:382
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:439
+#: mediagoblin/user_pages/views.py:430
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 f58e6a45..f9666be3 100644
Binary files a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
index 12d34b55..ea0d5d25 100644
--- a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# , 2013.
-# , 2011-2012.
+# velmont , 2013
+# velmont , 2011-2012
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-10 13:31+0000\n"
-"Last-Translator: velmont \n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+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,34 +20,39 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
-msgstr "Ugyldig brukarnamn eller passord."
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr "Dette feltet tek ikkje epostadresser."
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr "Dette feltet krev ei epostadresse."
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "Brukarnamn"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
msgid "Password"
msgstr "Passord"
-#: mediagoblin/auth/forms.py:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "Epost"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr "Brukarnamn eller epost"
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr "Ugyldig brukarnamn eller passord."
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr "Dette feltet tek ikkje epostadresser."
+
+#: mediagoblin/auth/tools.py:33
+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."
@@ -60,54 +65,54 @@ msgstr "Ein konto med dette brukarnamnet finst allereide."
msgid "Sorry, a user with that email address already exists."
msgstr "Ein brukar med den epostadressa finst allereie."
-#: mediagoblin/auth/views.py:174
+#: mediagoblin/auth/views.py:182
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:180
+#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
msgstr "Stadfestingsnykelen eller brukar-ID-en din er feil."
-#: mediagoblin/auth/views.py:198
+#: mediagoblin/auth/views.py:206
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:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr "Du har allereie verifisiert epostadressa."
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "Send ein ny stadfestingsepost."
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
msgstr "Fann ingen med det brukarnamnet."
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
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:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
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:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -118,7 +123,7 @@ msgid "Description of this work"
msgstr "Skildring av verk"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -134,11 +139,11 @@ msgstr "Merkelappar"
msgid "Separate tags by commas."
msgstr "Separer merkelappar med komma."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Nettnamn"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "Nettnamnet kan ikkje vera tomt"
@@ -166,45 +171,45 @@ msgid "This address contains errors"
msgstr "Adressa inneheld feil"
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr "Gamalt passort"
-
-#: mediagoblin/edit/forms.py:64
-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:67
-msgid "New password"
-msgstr "Nytt passord"
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr "Lisens-val"
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
msgstr "Dette vil vera standardvalet ditt for lisens."
-#: mediagoblin/edit/forms.py:82
+#: 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:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr "Tittelen kjan ikkje vera tom"
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 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:103
+#: mediagoblin/edit/forms.py:92
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/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr "Gamalt passort"
+
+#: mediagoblin/edit/forms.py:101
+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
+msgid "New password"
+msgstr "Nytt passord"
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr "Eit innlegg med denne adressetittelen finst allereie."
@@ -229,44 +234,63 @@ msgstr "Trå varsamt, du endrar nokon andre sin profil."
msgid "Profile changes saved"
msgstr "Lagra endring av profilen"
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr "Feil passord"
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr "Lagra kontoinstellingar"
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr "Du må stadfesta slettinga av kontoen din."
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Du har allereie ei samling med namn «%s»."
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
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:343
+#: mediagoblin/edit/views.py:329
msgid "You are editing another user's collection. Proceed with caution."
msgstr "Du endrar ein annan brukar si samling. Trå varsamt."
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr "Feil passord"
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr "Cannot link theme... no theme set\n"
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr "No asset directory for this theme\n"
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr "However, old link directory symlink found; removed.\n"
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
@@ -274,12 +298,16 @@ 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:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr "Orsak, stør ikkje den filtypen :("
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr "Skjedde noko gale med video transkodinga"
@@ -346,7 +374,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:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr "Endra kontoinstellingar"
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -419,72 +447,25 @@ msgstr "Endra kontoinstellingar"
msgid "Media processing panel"
msgstr "Verkprosesseringspanel"
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
msgstr "Logg ut"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Legg til verk"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "Lag ny samling"
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr "Drive av MediaGoblin, eit GNU-prosjekt."
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr "Lisensiert med AGPL. Kjeldekode er tilgjengeleg."
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr "Bilete av stressa goblin"
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr "Utforsk"
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "Heihei, velkomen til denne MediaGoblin-sida."
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr "Denne sida køyrer MediaGoblin, eit superbra program for å visa fram dine kreative verk."
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-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/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr "Har du ikkje ein enno? Det er enkelt!"
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "Opprett ein konto på denne sida eller set opp MediaGoblin på eigen tenar"
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr "Nyaste verk"
@@ -590,6 +571,53 @@ msgid ""
"%(verification_url)s"
msgstr "Hei %(username)s,\n\nopna fylgjande netadresse i netlesaren din for å aktivera kontoen din:\n\n%(verification_url)s"
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr "Drive av MediaGoblin, eit GNU-prosjekt."
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr "Lisensiert med AGPL. Kjeldekode er tilgjengeleg."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr "Utforsk"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "Heihei, velkomen til denne MediaGoblin-sida."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr "Denne sida køyrer MediaGoblin, eit superbra program for å visa fram dine kreative verk."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+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
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -602,13 +630,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:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr "Vedlegg"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr "Legg ved vedlegg"
@@ -625,12 +653,22 @@ msgstr "Bryt av"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -641,7 +679,7 @@ msgid "Yes, really delete my account"
msgstr "Ja, slett kontoen min"
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "Slett permanent"
@@ -658,7 +696,11 @@ 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:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr "Slett kontoen min"
@@ -683,6 +725,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/video.html:55
msgid "Download"
@@ -707,6 +750,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/video.html:61
msgid "Original file"
msgstr "Opphavleg fil"
@@ -715,6 +759,7 @@ msgstr "Opphavleg fil"
msgid "WebM file (Vorbis codec)"
msgstr "WebM-fil (Vorbis-kodek)"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -725,6 +770,10 @@ 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
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr "Slå av/på rotering"
@@ -823,7 +872,7 @@ msgstr "Vil du verkeleg sletta %(title)s?"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr "Fjerna %(media_title)s frå %(collection_title)s?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr "Fjern"
@@ -866,24 +915,28 @@ 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:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr "Legg att innspel"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr "Legg til dette innspelet"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
-msgstr "hjå"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
+#: 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 ""
-"Added on
\n"
-" %(date)s
"
-msgstr "Lagt til
\n %(date)s
"
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+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
@@ -1039,7 +1092,7 @@ msgstr "eldre"
msgid "Tagged with"
msgstr "Merka med"
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr "Klarte ikkje lesa biletefila."
@@ -1069,6 +1122,30 @@ msgid ""
" deleted."
msgstr "Ser ikkje ut til å finnast noko her. Orsak.
\nDersom du er sikker på at adressa finst, so er ho truleg flytta eller sletta."
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr "Innspel"
@@ -1100,73 +1177,77 @@ msgstr "-- Vel --"
msgid "Include a note"
msgstr "Legg ved eit notat"
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr "kom med innspel på innlegget ditt"
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr "Vops, innspelet ditt var tomt."
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr "Innspelet ditt er lagt til."
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr "Sjekk filene dine og prøv omatt."
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr "Du må velja eller laga ei samling"
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "«%s» er allereie i samling «%s»"
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "«%s» lagt til samling «%s»"
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr "Du sletta verket."
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "Sletta ikkje verket."
-#: mediagoblin/user_pages/views.py:301
+#: mediagoblin/user_pages/views.py:296
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:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr "Du fjerna fila frå samlinga."
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
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:389
+#: mediagoblin/user_pages/views.py:382
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:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "Samlinga «%s» sletta"
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr "Sletta ikkje samlinga."
-#: mediagoblin/user_pages/views.py:439
+#: mediagoblin/user_pages/views.py:430
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 ea905b61..5a234c82 100644
Binary files a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po
index 9edf8e2b..5a36889a 100644
--- a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# Daniel KoÄ , 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-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-05 00:04+0000\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+0000\n"
"Last-Translator: cwebber \n"
-"Language-Team: LANGUAGE \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"
"Content-Transfer-Encoding: 8bit\n"
@@ -19,34 +20,39 @@ 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:28
-msgid "Invalid User name or email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "Użytkownik"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: 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:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "Adres e-mail"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr "Użytkownik lub adres e-mail"
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr "NieprawidÅowa nazwa konta albo niewÅaÅciwy adres poczty elektronicznej."
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr "Niniejsze pole nie jest przeznaczone na adres poczty elektronicznej."
+
+#: mediagoblin/auth/tools.py:33
+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."
@@ -59,54 +65,54 @@ msgstr "Niestety użytkownik o takiej nazwie już istnieje."
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:174
+#: mediagoblin/auth/views.py:182
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:180
+#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
msgstr "NieprawidÅowy klucz weryfikacji lub identyfikator użytkownika."
-#: mediagoblin/auth/views.py:198
+#: mediagoblin/auth/views.py:206
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:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr "Twój adres e-mail już zostaŠzweryfikowany!"
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "WyÅlij ponownie e-mail weryfikujÄ
cy."
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
-msgstr ""
+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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
-msgstr ""
+msgstr "Nie potrafiÄ znaleÅºÄ nikogo o tej nazwie użytkownika."
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
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:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
msgid "You can now log in using your new password."
-msgstr "Teraz możesz siÄ zalogowaÄ używajÄ
c nowe hasÅo."
+msgstr "Teraz możesz siÄ zalogowaÄ używajÄ
c nowego hasÅa."
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -117,7 +123,7 @@ msgid "Description of this work"
msgstr "Opis tej pracy"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -133,11 +139,11 @@ msgstr "Znaczniki"
msgid "Separate tags by commas."
msgstr "Rozdzielaj znaczniki przecinkami."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Slug"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "Slug nie może byÄ pusty"
@@ -165,45 +171,45 @@ msgid "This address contains errors"
msgstr "Ten adres zawiera bÅÄdy"
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr "Stare hasÅo"
-
-#: mediagoblin/edit/forms.py:64
-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:67
-msgid "New password"
-msgstr "Nowe hasÅo"
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
-msgstr ""
+msgstr "Ulubiona licencja"
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
-msgstr ""
+msgstr "To bÄdzie twoja domyÅlna licencja dla wgrywanych mediów."
-#: mediagoblin/edit/forms.py:82
+#: 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:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr "TytuÅ nie może byÄ pusty"
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "Opis tej kolekcji"
-#: mediagoblin/edit/forms.py:103
+#: mediagoblin/edit/forms.py:92
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/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr "Stare hasÅo"
+
+#: mediagoblin/edit/forms.py:101
+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
+msgid "New password"
+msgstr "Nowe hasÅo"
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr "Adres z tym slugiem dla tego użytkownika już istnieje."
@@ -214,11 +220,11 @@ msgstr "Edytujesz media innego użytkownika. Zachowaj ostrożnoÅÄ."
#: mediagoblin/edit/views.py:155
#, python-format
msgid "You added the attachment %s!"
-msgstr ""
+msgstr "DodaÅeÅ zaÅÄ
cznik %s!"
#: mediagoblin/edit/views.py:182
msgid "You can only edit your own profile."
-msgstr ""
+msgstr "Masz możliwoÅÄ edycji tylko wÅasnego profilu."
#: mediagoblin/edit/views.py:188
msgid "You are editing a user's profile. Proceed with caution."
@@ -228,57 +234,80 @@ msgstr "Edytujesz profil innego użytkownika. Zachowaj ostrożnoÅÄ."
msgid "Profile changes saved"
msgstr "Zapisano zmiany profilu"
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr "NieprawidÅowe hasÅo"
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr "Zapisano ustawienia konta"
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
-msgstr ""
+msgstr "Musisz potwierdziÄ, że chcesz skasowaÄ swoje konto."
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Kolekcja \"%s\" już istnieje!"
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
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:343
+#: mediagoblin/edit/views.py:329
msgid "You are editing another user's collection. Proceed with caution."
msgstr "Edytujesz kolekcjÄ innego użytkownika. Zachowaj ostrożnoÅÄ."
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr "NieprawidÅowe hasÅo"
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+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"
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr "Brak katalogu danych dla tego motywu\n"
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr "Znaleziono stary odnoÅnik symboliczny do katalogu; usuniÄto.\n"
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
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 ""
+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:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr "NIestety, nie obsÅugujemy tego typu plików :-("
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr "Konwersja wideo nie powiodÅa siÄ"
@@ -315,7 +344,7 @@ msgstr "Opis"
msgid ""
"This will be visible to users allowing your\n"
" application to authenticate as them."
-msgstr ""
+msgstr "To bÄdzie widoczne dla użytkowników, pozwalajÄ
câ twojej aplikacji uwierzytelniaÄ siÄ jako oni."
#: mediagoblin/plugins/oauth/forms.py:40
msgid "Type"
@@ -345,17 +374,17 @@ 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:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr "Klient {0} zostaÅ zarejestrowany!"
#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22
msgid "OAuth client connections"
-msgstr ""
+msgstr "PoÅÄ
czenia do OAuth"
#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22
msgid "Your OAuth clients"
-msgstr ""
+msgstr "Twoi klienci OAuth"
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
@@ -364,7 +393,7 @@ msgstr ""
msgid "Add"
msgstr "Dodaj"
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr "NiewÅaÅciwy plik dla tego rodzaju mediów."
@@ -372,45 +401,45 @@ msgstr "NiewÅaÅciwy plik dla tego rodzaju mediów."
msgid "File"
msgstr "Plik"
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr "Musisz podaÄ plik."
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr "Hura! WysÅano!"
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr "Kolekcja \"%s\" zostaÅa dodana!"
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr "Zweryfikuj swój adres e-mail!"
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
-msgstr ""
+msgstr "wyloguj siÄ"
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
-msgstr ""
+msgstr "konto %(user_name)s"
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr "ZmieÅ ustawienia konta"
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -418,72 +447,25 @@ msgstr "ZmieÅ ustawienia konta"
msgid "Media processing panel"
msgstr "Panel przetwarzania mediów"
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
-msgstr ""
+msgstr "Wyloguj siÄ"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Dodaj media"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr "Opublikowane na licencji AGPL. DostÄpny jest kod źródÅowy."
+msgstr "Utwórz nowÄ
kolekcjÄ"
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr "Odkrywaj"
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "CzeÅÄ, witaj na stronie MediaGoblin!"
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr "Ten serwis dziaÅa w oparciu o MediaGoblin, Åwietne oprogramowanie do publikowania mediów."
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-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."
+msgstr "Grafika zestresowanego goblina"
-#: mediagoblin/templates/mediagoblin/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr "Jeszcze go nie masz? To proste!"
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "Utwórz konto w tym serwisie\n lub\n zaÅóż wÅasny serwis MediaGoblin"
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr "Najnowsze media"
@@ -589,6 +571,53 @@ msgid ""
"%(verification_url)s"
msgstr "CzeÅÄ %(username)s,\n\naby aktywowaÄ twoje konto GNU MediaGoblin, otwórz nastÄpujÄ
cÄ
stronÄ w swojej przeglÄ
darce:\n\n%(verification_url)s"
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr "NapÄdzane przez oprogramowanie MediaGoblin, bÄdÄ
ce czÄÅciÄ
projektu GNU."
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr "Opublikowane na licencji AGPL. DostÄpny jest kod źródÅowy."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr "Odkrywaj"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "CzeÅÄ, witaj na stronie MediaGoblin!"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr "Ten serwis dziaÅa w oparciu o MediaGoblin, Åwietne oprogramowanie do publikowania mediów."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+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
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -601,13 +630,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:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr "ZaÅÄ
czniki"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr "Dodaj zaÅÄ
cznik"
@@ -624,23 +653,33 @@ msgstr "Anuluj"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
-msgstr ""
+msgstr "Czy naprawdÄ skasowaÄ użytkownika '%(user_name)s' oraz usunÄ
Ä wszystkie jego pliki i komentarze?"
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35
msgid "Yes, really delete my account"
-msgstr ""
+msgstr "Tak, naprawdÄ chcÄ skasowaÄ swoje konto"
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "UsuÅ na staÅe"
@@ -657,10 +696,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:59
-msgid "Delete my account"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+msgid "Delete my account"
+msgstr "UsuÅ moje konto"
+
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
@@ -682,6 +725,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/video.html:55
msgid "Download"
@@ -706,6 +750,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/video.html:61
msgid "Original file"
msgstr "Oryginalny plik"
@@ -714,6 +759,7 @@ msgstr "Oryginalny plik"
msgid "WebM file (Vorbis codec)"
msgstr "plik WebM (kodek Vorbis)"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -724,59 +770,63 @@ 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
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
-msgstr ""
+msgstr "ObróÄ"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
-msgstr ""
+msgstr "Perspektywa"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
msgid "Front"
-msgstr ""
+msgstr "PoczÄ
tek"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
msgid "Top"
-msgstr ""
+msgstr "Góra"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
msgid "Side"
-msgstr ""
+msgstr "KrawÄdź"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
msgid "WebGL"
-msgstr ""
+msgstr "WebGL"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
msgid "Download model"
-msgstr ""
+msgstr "Pobierz model"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
msgid "File Format"
-msgstr ""
+msgstr "Format pliku"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
msgid "Object Height"
-msgstr ""
+msgstr "WysokoÅÄ obiektu"
#: mediagoblin/templates/mediagoblin/media_displays/video.html:44
msgid ""
"Sorry, this video will not work because\n"
" your web browser does not support HTML5 \n"
" video."
-msgstr ""
+msgstr "Niestety ten materiaÅ nie bÄdzie widocznyâ, ponieważ twoja przeglÄ
darka nieâ osbÅuguje formatu HTML5."
#: 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 ""
+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)"
@@ -822,19 +872,19 @@ msgstr "Na pewno usunÄ
Ä %(title)s?"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr "Na pewno usunÄ
Ä %(media_title)s z %(collection_title)s?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr "UsuÅ"
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21
#, python-format
msgid "%(username)s's collections"
-msgstr ""
+msgstr "kolekcja użytkownika %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28
#, python-format
msgid "%(username)s's collections"
-msgstr ""
+msgstr "kolekcje użytkownika %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
#, python-format
@@ -853,7 +903,7 @@ msgstr "Media użytkownika %(username)s"
msgid ""
"%(username)s's media with tag %(tag)s"
-msgstr ""
+msgstr "pliki użytkownika %(username)s z tagiem %(tag)s"
#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48
#, python-format
@@ -865,30 +915,34 @@ 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:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr "Dodaj komentarz"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr "Dodaj komentarz"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
-msgstr "na"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
+#: 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 ""
-"Added on
\n"
-" %(date)s
"
-msgstr "Dodane
\n %(date)s
"
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+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
msgid "Add â%(media_title)sâ to a collection"
-msgstr ""
+msgstr "Dodaj â%(media_title)sâ do kolekcji"
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54
msgid "+"
@@ -967,7 +1021,7 @@ msgstr "Ten użytkownik nie wypeÅniÅ (jeszcze) opisu swojego profilu."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:124
msgid "Browse collections"
-msgstr ""
+msgstr "PrzeglÄ
daj kolekcje"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:137
#, python-format
@@ -988,15 +1042,15 @@ msgstr "Tu nie ma jeszcze żadnych mediów..."
#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49
msgid "(remove)"
-msgstr ""
+msgstr "(usuÅ)"
#: mediagoblin/templates/mediagoblin/utils/collections.html:21
msgid "Collected in"
-msgstr ""
+msgstr "Znajduje siÄ w kolekcji "
#: mediagoblin/templates/mediagoblin/utils/collections.html:40
msgid "Add to a collection"
-msgstr ""
+msgstr "Dodaj do kolekcji"
#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
@@ -1038,7 +1092,7 @@ msgstr "starsze"
msgid "Tagged with"
msgstr "Znaczniki:"
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr "Nie udaÅo siÄ odczytaÄ pliku grafiki."
@@ -1048,29 +1102,53 @@ msgstr "Ups!"
#: mediagoblin/tools/response.py:36
msgid "An error occured"
-msgstr ""
+msgstr "WystÄ
piÅ bÅÄ
d"
#: mediagoblin/tools/response.py:51
msgid "Operation not allowed"
-msgstr ""
+msgstr "Operacja niedozwolona"
#: mediagoblin/tools/response.py:52
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 ""
+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
msgid ""
"There doesn't seem to be a page at this address. Sorry!
If you're sure"
" the address is correct, maybe the page you're looking for has been moved or"
" deleted."
+msgstr "WyglÄ
da na to, że nic tutaj nie ma!
JeÅli jesteÅ pewny, że adres jest prawidÅowy, byÄ może strona zostaÅa skasowana lub przeniesiona."
+
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
msgstr ""
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
-msgstr ""
+msgstr "Komentarz"
#: mediagoblin/user_pages/forms.py:25
msgid ""
@@ -1089,7 +1167,7 @@ msgstr "Na pewno chcÄ usunÄ
Ä ten element z kolekcji"
#: mediagoblin/user_pages/forms.py:39
msgid "Collection"
-msgstr ""
+msgstr "Kolekcja"
#: mediagoblin/user_pages/forms.py:40
msgid "-- Select --"
@@ -1099,73 +1177,77 @@ msgstr "-- wybierz --"
msgid "Include a note"
msgstr "Dodaj notatkÄ"
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr "komentarze do twojego wpisu"
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr "Ups, twój komentarz nie zawieraÅ treÅci."
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr "Twój komentarz zostaŠopublikowany!"
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr "Sprawdź swoje wpisy i spróbuj ponownie."
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr "Musisz wybraÄ lub dodaÄ kolekcjÄ"
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "\"%s\" już obecne w kolekcji \"%s\""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "\"%s\" dodano do kolekcji \"%s\""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr "Media zostaÅy usuniÄte."
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
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:301
+#: mediagoblin/user_pages/views.py:296
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:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr "Element zostaÅ usuniÄty z kolekcji."
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
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:389
+#: mediagoblin/user_pages/views.py:382
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:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "UsuniÄto kolekcjÄ \"%s\""
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
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:439
+#: mediagoblin/user_pages/views.py:430
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 af50e027..5e83a7f2 100644
Binary files a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po
index 3b2ed203..fecb844c 100644
--- a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po
@@ -3,16 +3,17 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# Rafael Ferreira , 2013.
-# , 2011.
-# ufa , 2011.
-# Vinicius SM , 2013.
+# osc , 2013
+# Rafael Ferreira , 2013
+# osc , 2011
+# ufa , 2011
+# Canopus , 2013
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-05 00:04+0000\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+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"
@@ -22,34 +23,39 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
-msgstr "Nome de usuário ou email inválido."
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr "Este campo não aceita endereços de email."
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr "Este campo requer um endereço de email."
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "Nome de Usuário"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
msgid "Password"
msgstr "Senha"
-#: mediagoblin/auth/forms.py:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "Endereço de email"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr "Nome de usuário ou email"
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr "Nome de usuário ou email inválido."
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr "Este campo não aceita endereços de email."
+
+#: mediagoblin/auth/tools.py:33
+msgid "This field requires an email address."
+msgstr "Este campo requer um endereço de email."
+
#: mediagoblin/auth/views.py:54
msgid "Sorry, registration is disabled on this instance."
msgstr "Desculpa, o registro está desativado neste momento."
@@ -62,54 +68,54 @@ msgstr "Desculpe, um usuário com este nome já existe."
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:174
+#: mediagoblin/auth/views.py:182
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:180
+#: mediagoblin/auth/views.py:188
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:198
+#: mediagoblin/auth/views.py:206
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:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr "Você já verificou seu email!"
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "O email de verificação foi enviado novamente."
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
-msgstr ""
+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:261
+#: mediagoblin/auth/views.py:269
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:264
+#: mediagoblin/auth/views.py:272
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:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
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:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -120,7 +126,7 @@ msgid "Description of this work"
msgstr "Descrição desse trabalho"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -136,11 +142,11 @@ msgstr "Etiquetas"
msgid "Separate tags by commas."
msgstr "Separe as etiquetas com vÃrgulas."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Arquivo"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "O arquivo não pode estar vazio"
@@ -168,45 +174,45 @@ msgid "This address contains errors"
msgstr "Este endereço contém erros"
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr "Senha antiga"
-
-#: mediagoblin/edit/forms.py:64
-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:67
-msgid "New password"
-msgstr "Nova senha"
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr "Licença preferida"
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
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:82
+#: 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:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr "O tÃtulo não pode ficar vazio"
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 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:103
+#: mediagoblin/edit/forms.py:92
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/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr "Senha antiga"
+
+#: mediagoblin/edit/forms.py:101
+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
+msgid "New password"
+msgstr "Nova senha"
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr "Uma entrada com esse arquivo já existe para esse usuário"
@@ -231,44 +237,63 @@ msgstr "Você está editando um perfil de usuário. Tenha cuidado."
msgid "Profile changes saved"
msgstr "As mudanças no perfil foram salvas"
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr "Senha errada"
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr "As mudanças na conta foram salvas"
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr "Você precisa confirmar a exclusão da sua conta."
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Você já tem uma coleção chamada \"%s\"!"
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
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:343
+#: mediagoblin/edit/views.py:329
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/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr "Senha errada"
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+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"
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr ""
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
@@ -276,12 +301,16 @@ 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:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr "Desculpe, não tenho suporte a este tipo de arquivo :("
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr "Conversão do vÃdeo falhou"
@@ -348,7 +377,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr "Este campo é necessário para clientes públicos"
-#: mediagoblin/plugins/oauth/views.py:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr "O cliente {0} foi registrado!"
@@ -367,7 +396,7 @@ msgstr "Seus clientes OAuth"
msgid "Add"
msgstr "Adicionar"
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr "Arquivo inválido para esse tipo de mÃdia"
@@ -375,45 +404,45 @@ msgstr "Arquivo inválido para esse tipo de mÃdia"
msgid "File"
msgstr "Arquivo"
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr "Você deve fornecer um arquivo."
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr "Eba! Enviado!"
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr "Coleção \"%s\" adicionada!"
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr "Verifique seu email!"
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr "sair"
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
msgstr "Conta de %(user_name)s"
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr "Mudar configurações da conta"
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -421,72 +450,25 @@ msgstr "Mudar configurações da conta"
msgid "Media processing panel"
msgstr "Painel de processamento de mÃdia"
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
-msgstr ""
+msgstr "Sair"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Adicionar mÃdia"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "Criar nova coleção"
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr "Lançado sob a AGPL. Código fonte disponÃvel."
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr "Explorar"
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "Olá, bem-vindo a este site MediaGoblin."
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr "Este site roda o MediaGoblin, um programa excelente para hospedar, gerenciar e compartilhar mÃdia."
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-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/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr " Ainda não tem uma conta? à facil!"
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "Criar uma conta neste site\nou\nConfigurar MediaGoblin em seu próprio servidor"
+msgstr "Imagem do goblin se estressando"
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr "MÃdia mais recente"
@@ -592,6 +574,53 @@ msgid ""
"%(verification_url)s"
msgstr "Olá %(username)s,\n\nPara ativar sua conta GNU MediaGoblin, visite este endereço no seu navegador:\n\n%(verification_url)s"
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr "Fornecido pelo MediaGoblin, um projeto GNU."
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr "Lançado sob a AGPL. Código fonte disponÃvel."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr "Explorar"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "Olá, bem-vindo a este site MediaGoblin."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr "Este site roda o MediaGoblin, um programa excelente para hospedar, gerenciar e compartilhar mÃdia."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+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
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -604,13 +633,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:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr "Anexos"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr "Adicionar anexo"
@@ -627,12 +656,22 @@ msgstr "Cancelar"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -643,7 +682,7 @@ msgid "Yes, really delete my account"
msgstr "Sim, realmente deletar minha conta"
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "Deletar permanentemente"
@@ -660,7 +699,11 @@ 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:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr "Deletar minha conta"
@@ -685,6 +728,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/video.html:55
msgid "Download"
@@ -709,6 +753,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/video.html:61
msgid "Original file"
msgstr "Arquivo original"
@@ -717,6 +762,7 @@ msgstr "Arquivo original"
msgid "WebM file (Vorbis codec)"
msgstr "Arquivo WebM (codec Vorbis)"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -727,6 +773,10 @@ msgstr "Arquivo WebM (codec Vorbis)"
msgid "Image for %(media_title)s"
msgstr "Imagem para %(media_title)s"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr "Alternar Rotação"
@@ -825,7 +875,7 @@ msgstr "Realmente apagar %(title)s ?"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr "Realmente remover %(media_title)s de %(collection_title)s?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr "Apagar"
@@ -856,7 +906,7 @@ msgstr "MÃdia de %(username)s's"
msgid ""
"%(username)s's media with tag %(tag)s"
-msgstr ""
+msgstr "MÃdias de %(username)s com a etiqueta %(tag)s"
#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48
#, python-format
@@ -868,24 +918,28 @@ 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:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr "Adicionar um comentário"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr "Adicionar este comentário"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
-msgstr "em"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
+#: 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 ""
-"Added on
\n"
-" %(date)s
"
-msgstr "Adicionado em
\n%(date)s
"
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+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
@@ -987,7 +1041,7 @@ msgstr "Aqui é onde sua mÃdia vai aparecer, mas parece que você não adiciono
#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84
#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
msgid "There doesn't seem to be any media here yet..."
-msgstr "Aparentemente não há nenhuma mÃdia aqui ainda..."
+msgstr "Parece que ainda não há nenhuma mÃdia por aqui..."
#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49
msgid "(remove)"
@@ -999,7 +1053,7 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/utils/collections.html:40
msgid "Add to a collection"
-msgstr ""
+msgstr "Adicionar a uma coleção"
#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
@@ -1041,7 +1095,7 @@ msgstr "mais antiga"
msgid "Tagged with"
msgstr "Etiquetas"
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr "Não foi possÃvel ler o arquivo de imagem."
@@ -1071,6 +1125,30 @@ msgid ""
" deleted."
msgstr "Parece que não há uma página com este endereço. Desculpe!
Se você tem certeza que este endereço está correto, talvez a página que esteja procurando tenha sido movida ou deletada."
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr "Comentário"
@@ -1096,79 +1174,83 @@ msgstr "Coleção"
#: mediagoblin/user_pages/forms.py:40
msgid "-- Select --"
-msgstr ""
+msgstr "-- Selecionar --"
#: mediagoblin/user_pages/forms.py:42
msgid "Include a note"
msgstr "Incluir uma nota"
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr "comentou na sua publicação"
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr "Ops, seu comentário estava vazio."
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr "Seu comentário foi postado!"
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
-msgstr ""
+msgstr "Por favor, verifique suas entradas e tente novamente."
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr "Você deve selecionar ou adicionar uma coleção"
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "\"%s\" já está na coleção \"%s\""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "\"%s\" adicionado à coleção \"%s\""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr "Você deletou a mÃdia."
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
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:301
+#: mediagoblin/user_pages/views.py:296
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:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr "Você deletou o item da coleção."
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
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:389
+#: mediagoblin/user_pages/views.py:382
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:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "Você deletou a coleção \"%s\""
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
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:439
+#: mediagoblin/user_pages/views.py:430
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 62cbf028..309855f5 100644
Binary files a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po
index da585d5c..4a33f751 100644
--- a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# , 2011.
-# George Pop , 2011-2013.
+# George Pop , 2011
+# George Pop , 2011-2013
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-10 04:13+0000\n"
-"Last-Translator: George Pop \n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+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,34 +20,39 @@ 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:28
-msgid "Invalid User name or email address."
-msgstr "Nume de utilizator sau adresÄ de e-mail nevalidÄ."
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr "AceastÄ rubricÄ nu este pentru adrese de e-mail."
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr "AceastÄ rubricÄ trebuie completatÄ cu o adresÄ de e-mail."
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "Nume de utilizator"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
msgid "Password"
msgstr "ParolÄ"
-#: mediagoblin/auth/forms.py:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "Adresa de e-mail"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr "Numele de utilizator sau adresa de e-mail"
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr "Nume de utilizator sau adresÄ de e-mail nevalidÄ."
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr "AceastÄ rubricÄ nu este pentru adrese de e-mail."
+
+#: mediagoblin/auth/tools.py:33
+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."
@@ -60,54 +65,54 @@ msgstr "Ne pare rÄu, existÄ deja un utilizator cu acelaÈi nume."
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:174
+#: mediagoblin/auth/views.py:182
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:180
+#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
msgstr "Cheie de verificare sau user ID incorect."
-#: mediagoblin/auth/views.py:198
+#: mediagoblin/auth/views.py:206
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:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr "Adresa ta de e-mail a fost deja verificatÄ!"
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "E-mail-ul de verificare a fost retrimis."
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
msgstr "Nu existÄ nimeni cu acest nume de utilizator."
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
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:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
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:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -118,7 +123,7 @@ msgid "Description of this work"
msgstr "Descrierea acestui fiÈier"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -134,11 +139,11 @@ msgstr "Cuvinte-cheie"
msgid "Separate tags by commas."
msgstr "Desparte cuvintele-cheie prin virgulÄ."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Identificator"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "Identificatorul nu poate sÄ lipseascÄ"
@@ -166,45 +171,45 @@ msgid "This address contains errors"
msgstr "AceastÄ adresÄ prezintÄ erori"
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr "Vechea parolÄ"
-
-#: mediagoblin/edit/forms.py:64
-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:67
-msgid "New password"
-msgstr "Noua parolÄ"
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr "LicenÈa preferatÄ"
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
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:82
+#: 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:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr "Titlul nu poate sÄ fie gol"
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 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:103
+#: mediagoblin/edit/forms.py:92
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/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr "Vechea parolÄ"
+
+#: mediagoblin/edit/forms.py:101
+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
+msgid "New password"
+msgstr "Noua parolÄ"
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr "ExistÄ deja un entry cu acelaÈi identificator pentru acest utilizator."
@@ -229,44 +234,63 @@ msgstr "Editezi profilul unui utilizator. Se recomandÄ prudenÈÄ."
msgid "Profile changes saved"
msgstr "ModificÄrile profilului au fost salvate"
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr "ParolÄ incorectÄ"
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr "SetÄrile pentru acest cont au fost salvate"
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr "Trebuie sÄ confirmi Ètergerea contului tÄu."
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Ai deja o colecÈie numitÄ \"%s\"!"
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
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:343
+#: mediagoblin/edit/views.py:329
msgid "You are editing another user's collection. Proceed with caution."
msgstr "Lucrezi pe colecÈia unui alt utilizator. Se recomandÄ prudenÈÄ."
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr "ParolÄ incorectÄ"
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+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"
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr "Nu existÄ un folder de elemente pentru aceastÄ temÄ\n"
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr "A fost însÄ gÄsit un symlink cÄtre vechiul folder; s-a Èters.\n"
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
@@ -274,12 +298,16 @@ 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:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr "Scuze, nu recunosc acest tip de fiÈier :("
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr "Transcodarea video a eÈuat"
@@ -346,7 +374,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:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr "Clientul {0} a fost înregistrat!"
@@ -365,7 +393,7 @@ msgstr "ClienÈii tÄi OAuth"
msgid "Add"
msgstr "AdaugÄ"
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr "Formatul fiÈierului nu corespunde cu tipul de media selectat."
@@ -373,45 +401,45 @@ msgstr "Formatul fiÈierului nu corespunde cu tipul de media selectat."
msgid "File"
msgstr "FiÈier"
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr "Trebuie sÄ selectezi un fiÈier."
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr "Ura! Trimis!"
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr "ColecÈia \"%s\" a fost creatÄ!"
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr "VerificÄ adresa de e-mail!"
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr "IeÈire"
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
msgstr "Contul lui %(user_name)s"
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr "ModificÄ setÄrile contului"
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -419,72 +447,25 @@ msgstr "ModificÄ setÄrile contului"
msgid "Media processing panel"
msgstr "Panou de procesare media"
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
msgstr "IeÈire"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Trimite fiÈier"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "CreeazÄ colecÈie nouÄ"
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr "Construit cu MediaGoblin, un proiect GNU."
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr "Publicat sub licenÈa AGPL. Codul sursÄ este disponibil."
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr "Imagine cu un goblin stresat"
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr "ExploreazÄ"
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "Salut, bine ai venit pe acest site MediaGoblin!"
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr "Acest site foloseÈte MediaGoblin, un software excepÈional pentru gÄzduirea fiÈierelor media."
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
-msgstr "Pentru a adÄuga fiÈierele tale Èi pentru a comenta te poÈi autentifica cu contul tÄu MediaGoblin."
-
-#: mediagoblin/templates/mediagoblin/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr "ÃncÄ nu ai unul? E simplu!"
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "CreeazÄ un cont pe acest site\n sau\n InstaleazÄ MediaGoblin pe serverul tÄu"
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr "Cele mai recente fiÈiere"
@@ -590,6 +571,53 @@ msgid ""
"%(verification_url)s"
msgstr "BunÄ, %(username)s,\n\npentru activarea contului tÄu la GNU MediaGoblin, acceseazÄ adresa urmÄtoare:\n\n%(verification_url)s"
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr "Construit cu MediaGoblin, un proiect GNU."
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr "Publicat sub licenÈa AGPL. Codul sursÄ este disponibil."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr "ExploreazÄ"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "Salut, bine ai venit pe acest site MediaGoblin!"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr "Acest site foloseÈte MediaGoblin, un software excepÈional pentru gÄzduirea fiÈierelor media."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+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
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -602,13 +630,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:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr "Anexe"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr "AtaÈeazÄ"
@@ -625,12 +653,22 @@ msgstr "Anulare"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -641,7 +679,7 @@ msgid "Yes, really delete my account"
msgstr "Da, doresc Ètergerea contului meu"
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "Èterge definitiv"
@@ -658,7 +696,11 @@ 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:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr "Èterge contul meu"
@@ -683,6 +725,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/video.html:55
msgid "Download"
@@ -707,6 +750,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/video.html:61
msgid "Original file"
msgstr "FiÈierul original"
@@ -715,6 +759,7 @@ msgstr "FiÈierul original"
msgid "WebM file (Vorbis codec)"
msgstr "FiÈier WebM (codec Vorbis)"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -725,6 +770,10 @@ 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
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr "Rotire"
@@ -823,7 +872,7 @@ msgstr "Sigur doreÈti sÄ Ètergi %(title)s?"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr "Sigur doreÈti sÄ Ètergi %(media_title)s din %(collection_title)s?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr "Èterge"
@@ -866,24 +915,28 @@ 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:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr "AdaugÄ un comentariu"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr "Trimite acest comentariu"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
-msgstr "la"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
+#: 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 ""
-"Added on
\n"
-" %(date)s
"
-msgstr "AdÄugat la
\n %(date)s
"
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+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
@@ -1039,7 +1092,7 @@ msgstr "mai vechi"
msgid "Tagged with"
msgstr "Etichetat cu cuvintele-cheie"
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr "FiÈierul cu imaginea nu a putut fi citit."
@@ -1069,6 +1122,30 @@ msgid ""
" deleted."
msgstr "Nu existÄ nicio paginÄ la aceastÄ adresÄ.
DacÄ sunteÈi sigur cÄ adresa este corectÄ, poate cÄ pagina pe care o cÄutaÈi a fost mutatÄ sau ÈtearsÄ."
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr "Comentariu"
@@ -1100,73 +1177,77 @@ msgstr "-- SelecteazÄ --"
msgid "Include a note"
msgstr "AdaugÄ o notiÈÄ"
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr "a fÄcut un comentariu la postarea ta"
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr "Hopa, ai uitat sÄ scrii comentariul."
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr "Comentariul tÄu a fost trimis!"
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr "VerificÄ datele Èi încearcÄ din nou."
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr "Trebuie sÄ alegi sau sÄ creezi o colecÈie"
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "\"%s\" este deja în colecÈia \"%s\""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "\"%s\" a fost adÄugat la colecÈia \"%s\""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr "Ai Èters acest fiÈier"
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
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:301
+#: mediagoblin/user_pages/views.py:296
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:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr "Ai Èters acest articol din colecÈie."
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
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:389
+#: mediagoblin/user_pages/views.py:382
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:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "Ai Èters colecÈia \"%s\""
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
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:439
+#: mediagoblin/user_pages/views.py:430
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 759f5337..89836e48 100644
Binary files a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po
index 0dc099ed..12c79b17 100644
--- a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# , 2013.
-# , 2011-2012.
+# aleksejrs , 2013
+# aleksejrs , 2011-2012
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-10 15:35+0000\n"
-"Last-Translator: aleksejrs \n"
-"Language-Team: LANGUAGE \n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+0000\n"
+"Last-Translator: cwebber \n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/mediagoblin/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -20,34 +20,39 @@ msgstr ""
"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr "ÐÑо поле не Ð´Ð»Ñ Ð°Ð´ÑеÑа ÑлекÑÑонной поÑÑÑ."
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr "ÐÑо поле â Ð´Ð»Ñ Ð°Ð´ÑеÑа ÑлекÑÑонной поÑÑÑ."
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "Ðогин"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
msgid "Password"
msgstr "ÐаÑолÑ"
-#: mediagoblin/auth/forms.py:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "ÐдÑÐµÑ ÑлекÑÑонной поÑÑÑ"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr "ÐÐ¼Ñ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ Ð¸Ð»Ð¸ адÑÐµÑ ÑлекÑÑонной поÑÑÑ"
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr "ÐÑо поле не Ð´Ð»Ñ Ð°Ð´ÑеÑа ÑлекÑÑонной поÑÑÑ."
+
+#: mediagoblin/auth/tools.py:33
+msgid "This field requires an email address."
+msgstr "ÐÑо поле â Ð´Ð»Ñ Ð°Ð´ÑеÑа ÑлекÑÑонной поÑÑÑ."
+
#: mediagoblin/auth/views.py:54
msgid "Sorry, registration is disabled on this instance."
msgstr "ÐзвиниÑе, на ÑÑом ÑайÑе ÑегиÑÑÑаÑÐ¸Ñ Ð·Ð°Ð¿ÑеÑена."
@@ -60,54 +65,54 @@ msgstr "ÐзвиниÑе, полÑзоваÑÐµÐ»Ñ Ñ ÑÑим именем Ñж
msgid "Sorry, a user with that email address already exists."
msgstr "Сожалеем, но на ÑÑÐ¾Ñ Ð°Ð´ÑÐµÑ ÑлекÑÑонной поÑÑÑ Ñже заÑегиÑÑÑиÑована дÑÑÐ³Ð°Ñ ÑÑÑÑÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ."
-#: mediagoblin/auth/views.py:174
+#: mediagoblin/auth/views.py:182
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "ÐÐ°Ñ Ð°Ð´ÑÐµÑ ÑлекÑÑонной поÑÑÑ Ð¿Ð¾ÑвеÑжден. ÐÑ ÑепеÑÑ Ð¼Ð¾Ð¶ÐµÑе войÑи и наÑаÑÑ ÑедакÑиÑоваÑÑ Ñвой пÑоÑÐ¸Ð»Ñ Ð¸ загÑÑжаÑÑ Ð½Ð¾Ð²Ñе изобÑажениÑ!"
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
msgstr "ÐевеÑнÑй клÑÑ Ð¿ÑовеÑки или иденÑиÑикаÑÐ¾Ñ Ð¿Ð¾Ð»ÑзоваÑелÑ"
-#: mediagoblin/auth/views.py:198
+#: mediagoblin/auth/views.py:206
msgid "You must be logged in so we know who to send the email to!"
msgstr "Ðам надо пÑедÑÑавиÑÑÑÑ, ÑÑÐ¾Ð±Ñ Ð¼Ñ Ð·Ð½Ð°Ð»Ð¸, ÐºÐ¾Ð¼Ñ Ð¾ÑпÑавлÑÑÑ ÑообÑение!"
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr "ÐÑ Ñже поÑвеÑдили Ñвой адÑÐµÑ ÑлекÑÑонной поÑÑÑ!"
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "ÐеÑеÑлаÑÑ ÑообÑение Ñ Ð¿Ð¾Ð´ÑвеÑждением аккаÑнÑа."
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
msgstr "Ðе найдено никого Ñ Ñаким именем полÑзоваÑелÑ."
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "Ðам оÑпÑавлено ÑлекÑÑонное пиÑÑмо Ñ Ð¸Ð½ÑÑÑÑкÑиÑми по Ñмене паÑолÑ."
-#: mediagoblin/auth/views.py:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
msgid "You can now log in using your new password."
msgstr "ТепеÑÑ Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе войÑи, иÑполÑзÑÑ Ð²Ð°Ñ Ð½Ð¾Ð²Ñй паÑолÑ."
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -118,7 +123,7 @@ msgid "Description of this work"
msgstr "ÐпиÑание ÑÑого пÑоизведениÑ"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -134,11 +139,11 @@ msgstr "ÐеÑки"
msgid "Separate tags by commas."
msgstr "(ÑеÑез запÑÑÑÑ)"
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "ÐÑлиÑиÑелÑÐ½Ð°Ñ ÑаÑÑÑ Ð°Ð´ÑеÑа"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "ÐÑлиÑиÑелÑÐ½Ð°Ñ ÑаÑÑÑ Ð°Ð´ÑеÑа необÑ
одима"
@@ -166,45 +171,45 @@ msgid "This address contains errors"
msgstr "ÐÑÐ¾Ñ Ð°Ð´ÑÐµÑ ÑодеÑÐ¶Ð¸Ñ Ð¾Ñибки"
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr "СÑаÑÑй паÑолÑ"
-
-#: mediagoblin/edit/forms.py:64
-msgid "Enter your old password to prove you own this account."
-msgstr "ÐведиÑе Ñвой ÑÑаÑÑй паÑÐ¾Ð»Ñ Ð² каÑеÑÑве доказаÑелÑÑÑва, ÑÑо ÑÑо ваÑа ÑÑÑÑÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ."
-
-#: mediagoblin/edit/forms.py:67
-msgid "New password"
-msgstr "ÐовÑй паÑолÑ"
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr "ÐÑедпоÑиÑÐ°ÐµÐ¼Ð°Ñ Ð»Ð¸ÑензиÑ"
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
msgstr "Ðна бÑÐ´ÐµÑ Ð»Ð¸Ñензией по ÑмолÑÐ°Ð½Ð¸Ñ Ð´Ð»Ñ Ð²Ð°ÑиÑ
загÑÑзок"
-#: mediagoblin/edit/forms.py:82
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr "УведомлÑÑÑ Ð¼ÐµÐ½Ñ Ð¿Ð¾ e-mail о комменÑаÑиÑÑ
к моим Ñайлам"
-#: mediagoblin/edit/forms.py:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr "Ðазвание не Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¿ÑÑÑÑм"
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "ÐпиÑание ÑÑой коллекÑии"
-#: mediagoblin/edit/forms.py:103
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr "ÐÑлиÑиÑелÑÐ½Ð°Ñ ÑаÑÑÑ Ð°Ð´ÑеÑа ÑÑой коллекÑии, оÑÐ½Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð½Ð° названии. ÐбÑÑно не нÑжно ÐµÑ Ð¸Ð·Ð¼ÐµÐ½ÑÑÑ."
-#: mediagoblin/edit/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr "СÑаÑÑй паÑолÑ"
+
+#: mediagoblin/edit/forms.py:101
+msgid "Enter your old password to prove you own this account."
+msgstr "ÐведиÑе Ñвой ÑÑаÑÑй паÑÐ¾Ð»Ñ Ð² каÑеÑÑве доказаÑелÑÑÑва, ÑÑо ÑÑо ваÑа ÑÑÑÑÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ."
+
+#: mediagoblin/edit/forms.py:104
+msgid "New password"
+msgstr "ÐовÑй паÑолÑ"
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr "У ÑÑого полÑзоваÑÐµÐ»Ñ Ñже еÑÑÑ Ñайл Ñ Ñакой оÑлиÑиÑелÑной ÑаÑÑÑÑ Ð°Ð´ÑеÑа."
@@ -229,44 +234,63 @@ msgstr "ÐÑ ÑедакÑиÑÑеÑе пÑоÑÐ¸Ð»Ñ Ð¿Ð¾Ð»ÑзоваÑелÑ.
msgid "Profile changes saved"
msgstr "ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿ÑоÑÐ¸Ð»Ñ ÑоÑ
ÑаненÑ"
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr "ÐепÑавилÑнÑй паÑолÑ"
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr "ÐаÑÑÑойки ÑÑÑÑной запиÑи запиÑанÑ"
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr "Ðам нÑжно подÑвеÑдиÑÑ, ÑÑо Ð²Ñ Ñ
оÑиÑе ÑдалиÑÑ ÑÐ²Ð¾Ñ ÑÑÑÑнÑÑ Ð·Ð°Ð¿Ð¸ÑÑ."
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "У Ð²Ð°Ñ Ñже еÑÑÑ ÐºÐ¾Ð»Ð»ÐµÐºÑÐ¸Ñ Ñ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸ÐµÐ¼ «%s»!"
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
msgid "A collection with that slug already exists for this user."
msgstr "У ÑÑого полÑзоваÑÐµÐ»Ñ Ñже еÑÑÑ ÐºÐ¾Ð»Ð»ÐµÐºÑÐ¸Ñ Ñ Ñакой оÑлиÑиÑелÑной ÑаÑÑÑÑ Ð°Ð´ÑеÑа."
-#: mediagoblin/edit/views.py:343
+#: mediagoblin/edit/views.py:329
msgid "You are editing another user's collection. Proceed with caution."
msgstr "ÐÑ ÑедакÑиÑÑеÑе коллекÑÐ¸Ñ Ð´ÑÑгого полÑзоваÑелÑ. ÐÑдÑÑе оÑÑоÑожнÑ."
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr "ÐепÑавилÑнÑй паÑолÑ"
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr "Ðевозможно пÑивÑзаÑÑ ÑемÑ⦠не вÑбÑано ÑÑÑеÑÑвÑÑÑей ÑемÑ\n"
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr "У ÑÑой ÑÐµÐ¼Ñ Ð¾ÑÑÑÑÑÑвÑÐµÑ ÐºÐ°Ñалог Ñ ÑлеменÑами оÑоÑмлениÑ\n"
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr "Ðднако найдена (и Ñдалена) ÑÑаÑÐ°Ñ ÑимволиÑеÑÐºÐ°Ñ ÑÑÑлка на каÑалог.\n"
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
@@ -274,12 +298,16 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr "УвÑ, Ñ Ð½Ðµ поддеÑÐ¶Ð¸Ð²Ð°Ñ ÑÑÐ¾Ñ Ñип Ñайлов :("
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr "ÐеÑекодиÑовка видео не ÑдалаÑÑ"
@@ -346,7 +374,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr "ÐÐ»Ð¸ÐµÐ½Ñ {0} заÑегиÑÑÑиÑован!"
@@ -365,7 +393,7 @@ msgstr ""
msgid "Add"
msgstr "ÐобавиÑÑ"
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr "ÐепÑавилÑнÑй ÑоÑÐ¼Ð°Ñ Ñайла."
@@ -373,45 +401,45 @@ msgstr "ÐепÑавилÑнÑй ÑоÑÐ¼Ð°Ñ Ñайла."
msgid "File"
msgstr "Файл"
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr "ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð·Ð°Ð³ÑÑзиÑÑ Ñайл."
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr "УÑа! Файл загÑÑжен!"
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr "ÐоллекÑÐ¸Ñ Â«%s» добавлена!"
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr "ÐодÑвеÑдиÑе Ð²Ð°Ñ Ð°Ð´ÑÐµÑ ÑлекÑÑонной поÑÑÑ!"
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr "завеÑÑение ÑеанÑа"
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
msgstr "УÑÑÑÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ %(user_name)s"
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr "ÐзмениÑÑ Ð½Ð°ÑÑÑойки ÑÑÑÑной запиÑи"
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -419,72 +447,25 @@ msgstr "ÐзмениÑÑ Ð½Ð°ÑÑÑойки ÑÑÑÑной запиÑи"
msgid "Media processing panel"
msgstr "ÐÐ°Ð½ÐµÐ»Ñ Ð¾Ð±ÑабоÑки Ñайлов"
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
msgstr "ÐавеÑÑение ÑеанÑа"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "ÐобавиÑÑ ÑайлÑ"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "СоздаÑÑ Ð½Ð¾Ð²ÑÑ ÐºÐ¾Ð»Ð»ÐµÐºÑиÑ"
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr "РабоÑÐ°ÐµÑ Ð½Ð° MediaGoblin, пÑоекÑе GNU."
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr "Ðн опÑбликован на ÑÑловиÑÑ
AGPL. ÐоÑÑÑÐ¿Ð½Ñ Ð¸ÑÑ
однÑе ÑекÑÑÑ."
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr "ÐзобÑажение неÑвниÑаÑÑего гоблина"
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr "СмоÑÑеÑÑ"
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "ÐÑивеÑ! ÐобÑо пожаловаÑÑ Ð½Ð° Ð½Ð°Ñ MediaGoblinâовÑй ÑайÑ!"
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr "ÐÑÐ¾Ñ ÑÐ°Ð¹Ñ ÑабоÑÐ°ÐµÑ Ð½Ð° MediaGoblin, необÑкновенно замеÑаÑелÑном ÐÐ Ð´Ð»Ñ Ñ
оÑÑинга мÑлÑÑимедийнÑÑ
Ñайлов."
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
-msgstr "ÐÐ»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ ÑобÑÑвеннÑÑ
Ñайлов, комменÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¸ Ñ. п. Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе пÑедÑÑавиÑÑÑÑ Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ Ð²Ð°Ñей MediaGoblinâовой ÑÑÑÑной запиÑи."
-
-#: mediagoblin/templates/mediagoblin/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr "У Ð²Ð°Ñ ÐµÑ ÐµÑÑ Ð½ÐµÑ? Ðе пÑоблема!"
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "СоздайÑе ÑÑÑÑнÑÑ Ð·Ð°Ð¿Ð¸ÑÑ Ð½Ð° ÑÑом ÑайÑе\n или\n ÑÑÑановиÑе MediaGoblin на ÑобÑÑвеннÑй ÑеÑвеÑ"
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr "СамÑе новÑе ÑайлÑ"
@@ -590,6 +571,53 @@ msgid ""
"%(verification_url)s"
msgstr "ÐÑивеÑ, %(username)s!\n\nЧÑÐ¾Ð±Ñ Ð°ÐºÑивиÑоваÑÑ Ñвой аккаÑÐ½Ñ Ð² GNU MediaGoblin, оÑкÑойÑе в ÑвоÑм вебâбÑаÑзеÑе ÑледÑÑÑÑÑ ÑÑÑлкÑ:\n\n%(verification_url)s"
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr "РабоÑÐ°ÐµÑ Ð½Ð° MediaGoblin, пÑоекÑе GNU."
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr "Ðн опÑбликован на ÑÑловиÑÑ
AGPL. ÐоÑÑÑÐ¿Ð½Ñ Ð¸ÑÑ
однÑе ÑекÑÑÑ."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr "СмоÑÑеÑÑ"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "ÐÑивеÑ! ÐобÑо пожаловаÑÑ Ð½Ð° Ð½Ð°Ñ MediaGoblinâовÑй ÑайÑ!"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr "ÐÑÐ¾Ñ ÑÐ°Ð¹Ñ ÑабоÑÐ°ÐµÑ Ð½Ð° MediaGoblin, необÑкновенно замеÑаÑелÑном ÐÐ Ð´Ð»Ñ Ñ
оÑÑинга мÑлÑÑимедийнÑÑ
Ñайлов."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+msgid "Don't have one yet? It's easy!"
+msgstr "У Ð²Ð°Ñ ÐµÑ ÐµÑÑ Ð½ÐµÑ? Ðе пÑоблема!"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
+#, python-format
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -602,13 +630,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:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr "СопÑÑÑÑвÑÑÑие ÑайлÑ"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr "ÐобавиÑÑ ÑопÑÑÑÑвÑÑÑий Ñайл"
@@ -625,12 +653,22 @@ msgstr "ÐÑмена"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -641,7 +679,7 @@ msgid "Yes, really delete my account"
msgstr "Ðа, на Ñамом деле ÑдалиÑÑ Ð¼Ð¾Ñ ÑÑÑÑнÑÑ Ð·Ð°Ð¿Ð¸ÑÑ"
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "УдалиÑÑ Ð±ÐµÐ·Ð²Ð¾Ð·Ð²ÑаÑно"
@@ -658,7 +696,11 @@ msgstr "РедакÑиÑование %(media_title)s"
msgid "Changing %(username)s's account settings"
msgstr "ÐаÑÑÑойка ÑÑÑÑной запиÑи %(username)s"
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr "УдалиÑÑ Ð¼Ð¾Ñ ÑÑÑÑнÑÑ Ð·Ð°Ð¿Ð¸ÑÑ"
@@ -683,6 +725,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/video.html:55
msgid "Download"
@@ -707,6 +750,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/video.html:61
msgid "Original file"
msgstr "ÐÑÑ
однÑй Ñайл"
@@ -715,6 +759,7 @@ msgstr "ÐÑÑ
однÑй Ñайл"
msgid "WebM file (Vorbis codec)"
msgstr "WebMâÑайл (кодек â Vorbis)"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -725,6 +770,10 @@ msgstr "WebMâÑайл (кодек â Vorbis)"
msgid "Image for %(media_title)s"
msgstr "ÐзобÑажение «%(media_title)s»"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr ""
@@ -823,7 +872,7 @@ msgstr "УдалиÑÑ %(title)s?"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr "Ð Ñамом деле иÑклÑÑиÑÑ %(media_title)s из %(collection_title)s?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr "ÐÑклÑÑиÑÑ"
@@ -866,24 +915,28 @@ msgstr "Ð¤Ð°Ð¹Ð»Ñ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ %(username)
msgid "â Browsing media by %(username)s"
msgstr "â ÐÑоÑмоÑÑ Ñайлов полÑзоваÑÐµÐ»Ñ %(username)s"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr "ÐобавиÑÑ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑаÑий"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr "ÐобавиÑÑ ÑÑÐ¾Ñ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑаÑий"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
-msgstr "в"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
+#: 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 ""
-"Added on
\n"
-" %(date)s
"
-msgstr "Ðобавлено
\n %(date)s
"
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+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
@@ -1039,7 +1092,7 @@ msgstr "более ÑÑаÑÑе"
msgid "Tagged with"
msgstr "ÐеÑки"
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr "Ðе ÑдалоÑÑ Ð¿ÑоÑиÑаÑÑ Ñайл Ñ Ð¸Ð·Ð¾Ð±Ñажением."
@@ -1069,6 +1122,30 @@ msgid ""
" deleted."
msgstr ""
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr "ÐомменÑиÑоваÑÑ"
@@ -1100,73 +1177,77 @@ msgstr "-- ÐÑбеÑиÑе --"
msgid "Include a note"
msgstr "ÐÑимеÑание"
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr "оÑÑавил комменÑаÑий к ваÑÐµÐ¼Ñ ÑайлÑ"
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr "Ðй, Ð²Ð°Ñ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑаÑий бÑл пÑÑÑ."
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr "ÐÐ°Ñ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑаÑий ÑазмеÑÑн!"
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr "ÐожалÑйÑÑа, пÑовеÑÑÑе введÑнное и попÑобÑйÑе еÑÑ Ñаз."
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr "ÐеобÑ
одимо вÑбÑаÑÑ Ð¸Ð»Ð¸ добавиÑÑ ÐºÐ¾Ð»Ð»ÐµÐºÑиÑ"
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "«%s» â Ñже в коллекÑии «%s»"
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "«%s» добавлено в коллекÑÐ¸Ñ Â«%s»"
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr "ÐÑ Ñдалили Ñайл."
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "Файл не ÑдалÑн, Ñак как Ð²Ñ Ð½Ðµ подÑвеÑдили ÑÐ²Ð¾Ñ ÑвеÑенноÑÑÑ Ð³Ð°Ð»Ð¾Ñкой."
-#: mediagoblin/user_pages/views.py:301
+#: mediagoblin/user_pages/views.py:296
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "ÐÑ Ð½Ð° поÑоге ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ñайла дÑÑгого полÑзоваÑелÑ. ÐÑдÑÑе оÑÑоÑожнÑ."
-#: mediagoblin/user_pages/views.py:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr "ÐÑ Ð¸ÑклÑÑили Ñайл из коллекÑии."
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
msgid "The item was not removed because you didn't check that you were sure."
msgstr "Файл не иÑклÑÑÑн из коллекÑии, Ñак как Ð²Ñ Ð½Ðµ подÑвеÑдили ÑÐ²Ð¾Ñ Ð½Ð°Ð¼ÐµÑение оÑмеÑкой."
-#: mediagoblin/user_pages/views.py:389
+#: mediagoblin/user_pages/views.py:382
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr "ÐÑ Ð½Ð° поÑоге иÑклÑÑÐµÐ½Ð¸Ñ Ñайла из коллекÑии дÑÑгого полÑзоваÑелÑ. ÐÑдÑÑе оÑÑоÑожнÑ."
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "ÐÑ Ñдалили коллекÑÐ¸Ñ Â«%s»"
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr "ÐоллекÑÐ¸Ñ Ð½Ðµ Ñдалена, Ñак как Ð²Ñ Ð½Ðµ подÑвеÑдили ÑÐ²Ð¾Ñ Ð½Ð°Ð¼ÐµÑение оÑмеÑкой."
-#: mediagoblin/user_pages/views.py:439
+#: mediagoblin/user_pages/views.py:430
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 bc92bb13..a262aaee 100644
Binary files a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po
index 07932b77..ecb83098 100644
--- a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po
@@ -3,20 +3,20 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# Martin , 2013.
-# Martin Zatroch , 2012.
-# Morten Juhl-Johansen Zölde-Fejér , 2012.
-# Olle Jonsson , 2012.
-# Tanja Trudslev , 2012.
-# , 2011-2012.
+# martin , 2013
+# martin , 2012-2013
+# Morten Juhl-Johansen Zölde-Fejér , 2012
+# Olle Jonsson , 2012
+# ttrudslev , 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-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-05 00:04+0000\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+0000\n"
"Last-Translator: cwebber \n"
-"Language-Team: LANGUAGE \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"
"Content-Transfer-Encoding: 8bit\n"
@@ -24,34 +24,39 @@ msgstr ""
"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
-msgstr "Nesprávne použÃvateľské meno alebo e-mailová adresa."
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr "Toto pole neakceptuje e-mailové adresy."
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr "Toto pole vyžaduje e-mailovú adresu."
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "PoužÃvateľské meno"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
msgid "Password"
msgstr "Heslo"
-#: mediagoblin/auth/forms.py:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "Email adresse"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr "PoužÃvateľské meno alebo e-mailová adresa"
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr "Nesprávne použÃvateľské meno alebo e-mailová adresa."
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr "Toto pole neakceptuje e-mailové adresy."
+
+#: mediagoblin/auth/tools.py:33
+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á."
@@ -64,54 +69,54 @@ msgstr "PrepáÄ, rovnaké použÃvateľské meno už existuje."
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:174
+#: mediagoblin/auth/views.py:182
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "Tvoja e-mailová adresa bola overená. Teraz sa môžeš prihlásiť, upravovať profil a vkladať výtvory!"
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:188
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:198
+#: mediagoblin/auth/views.py:206
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:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr "Už máš overenú e-mailovú adresu!"
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "Opätovne zaslať overovacà e-mail."
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
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:261
+#: mediagoblin/auth/views.py:269
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:264
+#: mediagoblin/auth/views.py:272
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:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
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:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -122,7 +127,7 @@ msgid "Description of this work"
msgstr "Popis výtvoru"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -138,11 +143,11 @@ msgstr "Å tÃtky"
msgid "Separate tags by commas."
msgstr "Oddeľ Å¡tÃtky pomocou Äiarky."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Unikátna ÄasÅ¥ adresy"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "Unikátna ÄasÅ¥ adresy nesmie byÅ¥ prázdna"
@@ -170,45 +175,45 @@ msgid "This address contains errors"
msgstr "Daná adresa obsahuje chybu"
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr "Staré heslo"
-
-#: mediagoblin/edit/forms.py:64
-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:67
-msgid "New password"
-msgstr "Nové heslo"
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr "Preferencia licencie"
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
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:82
+#: 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:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr "Titulok nesmie byť prázdny."
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "Popis danej kolekcie"
-#: mediagoblin/edit/forms.py:103
+#: mediagoblin/edit/forms.py:92
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/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr "Staré heslo"
+
+#: mediagoblin/edit/forms.py:101
+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
+msgid "New password"
+msgstr "Nové heslo"
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr "Položku s rovnakou unikátnou ÄasÅ¥ou adresy už niekde máš."
@@ -233,44 +238,63 @@ msgstr "UpravujeÅ¡ profil iného použÃvateľa. Pristupuj zodpovedne. "
msgid "Profile changes saved"
msgstr "Zmeny v profile uložené"
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr "Nesprávne heslo"
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr "Nastavenia úÄtu uložené"
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr "PotrebujeÅ¡ potvrdiÅ¥ odstránenie svojho úÄtu."
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "Už máš kolekciu nazvanú ako \"%s\"!"
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
msgid "A collection with that slug already exists for this user."
msgstr "Kolekcia s týmto Å¡tÃtkom už máš."
-#: mediagoblin/edit/views.py:343
+#: mediagoblin/edit/views.py:329
msgid "You are editing another user's collection. Proceed with caution."
msgstr "UpravujeÅ¡ kolekciu iného použÃvateľa. Pristupuj zodpovedne. "
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr "Nesprávne heslo"
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+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"
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr "Žiadny prieÄinok položiek pre túto tému\n"
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr "Odstránené; hoci bol pôvodný symbolický odkaz adresára nájdený.\n"
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
@@ -278,12 +302,16 @@ 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:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr "PrepáÄ, nepodporujem tento typ súborov =("
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr "Konvertovanie videa zlyhalo"
@@ -350,7 +378,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:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr "ZmeniÅ¥ nastavenia úÄtu"
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -423,72 +451,25 @@ msgstr "ZmeniÅ¥ nastavenia úÄtu"
msgid "Media processing panel"
msgstr "Sekcia spracovania výtvorov"
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
-msgstr ""
+msgstr "Odhlásiť sa"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Pridať výtvor"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "Vytvoriť novú kolekciu"
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr "PoháÅa nás MediaGoblin, súÄasÅ¥ projektu GNU."
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr "Uvoľnené pod AGPL. Zdrojový kód plne dostupný."
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr "Obrázok hysterického goblina"
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr "Preskúmať"
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "Ahoj, vitaj na tejto MediaGoblin stránke!"
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr "Táto stránka použÃva MediaGoblin, výnimoÄne skvelý kus softvéru na hostovanie médiÃ."
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-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/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr "Har du ikke en endnu? Det er let!"
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-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 ZaložiÅ¥ MediaGoblin na vlastnom serveri"
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr "Aktuálne výtvory"
@@ -594,6 +575,53 @@ msgid ""
"%(verification_url)s"
msgstr "Ahoj %(username)s,\n\npre aktiváciu tvojho GNU MediaGoblin úÄtu, otvor nasledujúci odkaz vo\nsvojom prehliadaÄi:\n\n%(verification_url)s"
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr "PoháÅa nás MediaGoblin, súÄasÅ¥ projektu GNU."
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr "Uvoľnené pod AGPL. Zdrojový kód plne dostupný."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr "Preskúmať"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "Ahoj, vitaj na tejto MediaGoblin stránke!"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr "Táto stránka použÃva MediaGoblin, výnimoÄne skvelý kus softvéru na hostovanie médiÃ."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+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
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -606,13 +634,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:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr "PrÃlohy"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr "PridaÅ¥ prÃlohu"
@@ -629,12 +657,22 @@ msgstr "Zrušiť"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -645,7 +683,7 @@ msgid "Yes, really delete my account"
msgstr "Ãno, skutoÄne odstrániÅ¥ môj úÄet"
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "OdstráÅiÅ¥ permanentne"
@@ -662,7 +700,11 @@ 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:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr "OdstrániÅ¥ môj úÄet"
@@ -687,6 +729,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/video.html:55
msgid "Download"
@@ -711,6 +754,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/video.html:61
msgid "Original file"
msgstr "Originálny súbor"
@@ -719,6 +763,7 @@ msgstr "Originálny súbor"
msgid "WebM file (Vorbis codec)"
msgstr "WebM súbor (Vorbis kodek)"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -729,6 +774,10 @@ 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
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr "Zapnúť rotáciu"
@@ -827,7 +876,7 @@ msgstr "SkutoÄne odstrániÅ¥ %(title)s?"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr "SkutoÄne odstrániÅ¥ %(media_title)s z %(collection_title)s?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr "Odstrániť"
@@ -870,24 +919,28 @@ 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:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr "Pridať komentár"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr "Pridať tento komentár"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
-msgstr "o"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
+#: 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 ""
-"Added on
\n"
-" %(date)s
"
-msgstr "Pridané
\n %(date)s
"
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+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
@@ -1043,7 +1096,7 @@ msgstr "staršie"
msgid "Tagged with"
msgstr "OznaÄené ako"
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr "Nemožno preÄÃtaÅ¥ súbor obrázka."
@@ -1073,6 +1126,30 @@ msgid ""
" deleted."
msgstr "Zdá sa, že na tejto adrese sa niÄ nenachádza. PrepáÄ!
Pokiaľ si si istý, že adresa je správna, možno bola hľadaná stránka presunutá, respektÃve odstránená."
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr "Komentár"
@@ -1104,73 +1181,77 @@ msgstr "-- Vybrať --"
msgid "Include a note"
msgstr "Pridať poznámku"
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr "okmentoval tvoj prÃspevok"
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr "Hopla, tvoj komentár bol prázdny."
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr "Tvoj komentár bol pridaný!"
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr "ProsÃm skontroluj svoje položky a skús znova."
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr "MusÃÅ¡ vybraÅ¥, prÃpadne pridaÅ¥ kolekciu"
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "\"%s\" sa už nachádza v kolekcii \"%s\""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "\"%s pridané do kolekcie \"%s\""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr "Výtvor bol tebou odstránený."
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
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:301
+#: mediagoblin/user_pages/views.py:296
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:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr "Položka bola z kolekcie odstránená."
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
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:389
+#: mediagoblin/user_pages/views.py:382
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:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "Kolekcia \"%s\" bola úspešne odstránená."
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
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:439
+#: mediagoblin/user_pages/views.py:430
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 dd3de81b..199e761c 100644
Binary files a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po
index 98d62d59..35635acf 100644
--- a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# Jure Repinc , 2011.
+# Jure Repinc , 2011
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-05 00:04+0000\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+0000\n"
"Last-Translator: cwebber \n"
-"Language-Team: LANGUAGE \n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/mediagoblin/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -19,34 +19,39 @@ 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:28
-msgid "Invalid User name or email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "Uporabniško ime"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
msgid "Password"
msgstr "Geslo"
-#: mediagoblin/auth/forms.py:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "E-poštni naslov"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr ""
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:33
+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."
@@ -59,54 +64,54 @@ msgstr "Oprostite, uporabnik s tem imenom že obstaja."
msgid "Sorry, a user with that email address already exists."
msgstr ""
-#: mediagoblin/auth/views.py:174
+#: mediagoblin/auth/views.py:182
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:180
+#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
msgstr "Potrditveni kljuÄ ali uporabniÅ¡ka identifikacija je napaÄna"
-#: mediagoblin/auth/views.py:198
+#: mediagoblin/auth/views.py:206
msgid "You must be logged in so we know who to send the email to!"
msgstr ""
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr ""
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "Ponovno pošiljanje potrditvene e-pošte."
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -117,7 +122,7 @@ msgid "Description of this work"
msgstr ""
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -133,11 +138,11 @@ msgstr "Oznake"
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Oznaka"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "Oznaka ne sme biti prazna"
@@ -165,45 +170,45 @@ msgid "This address contains errors"
msgstr ""
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:64
-msgid "Enter your old password to prove you own this account."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:67
-msgid "New password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:82
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr ""
-#: mediagoblin/edit/forms.py:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:103
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:101
+msgid "Enter your old password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:104
+msgid "New password"
+msgstr ""
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr "Vnos s to oznako za tega uporabnika že obstaja."
@@ -228,44 +233,63 @@ msgstr "Urejate uporabniški profil. Nadaljujte pazljivo."
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr ""
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:343
+#: mediagoblin/edit/views.py:329
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr ""
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr ""
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
@@ -273,12 +297,16 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr ""
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr ""
@@ -345,7 +373,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr ""
@@ -364,7 +392,7 @@ msgstr ""
msgid "Add"
msgstr ""
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr "Za vrsto vsebine je bila podana napaÄna datoteka."
@@ -372,45 +400,45 @@ msgstr "Za vrsto vsebine je bila podana napaÄna datoteka."
msgid "File"
msgstr "Datoteka"
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr "Podati morate datoteko."
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr "Juhej! Poslano."
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -418,72 +446,25 @@ msgstr ""
msgid "Media processing panel"
msgstr "Podokno obdelovanja vsebine"
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Dodaj vsebino"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr ""
@@ -589,6 +570,53 @@ msgid ""
"%(verification_url)s"
msgstr "Pozdravljeni, %(username)s\n\nZa aktivacijo svojega raÄuna GNU MediaGoblin odprite\nnaslednji URL v svojem spletnem brskalniku:\n\n%(verification_url)s"
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+msgid "Don't have one yet? It's easy!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
+#, python-format
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -601,13 +629,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr ""
@@ -624,12 +652,22 @@ msgstr "PrekliÄi"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -640,7 +678,7 @@ msgid "Yes, really delete my account"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr ""
@@ -657,7 +695,11 @@ msgstr "Urejanje %(media_title)s"
msgid "Changing %(username)s's account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr ""
@@ -682,6 +724,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/video.html:55
msgid "Download"
@@ -706,6 +749,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr ""
@@ -714,6 +758,7 @@ msgstr ""
msgid "WebM file (Vorbis codec)"
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
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -724,6 +769,10 @@ msgstr ""
msgid "Image for %(media_title)s"
msgstr ""
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr ""
@@ -822,7 +871,7 @@ msgstr ""
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr ""
@@ -865,23 +914,27 @@ msgstr "Vsebina uporabnika %(username)s"
msgid "â Browsing media by %(username)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
+#: 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 ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
-#, python-format
-msgid ""
-"Added on
\n"
-" %(date)s
"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+msgid "Added"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
+msgid "Created"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
@@ -1038,7 +1091,7 @@ msgstr ""
msgid "Tagged with"
msgstr ""
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr ""
@@ -1068,6 +1121,30 @@ msgid ""
" deleted."
msgstr ""
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr ""
@@ -1099,73 +1176,77 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr ""
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr ""
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr ""
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr ""
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
msgid "The media was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:301
+#: mediagoblin/user_pages/views.py:296
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:389
+#: mediagoblin/user_pages/views.py:382
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:439
+#: mediagoblin/user_pages/views.py:430
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 276f1273..0f113dcb 100644
Binary files a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po
index 5c965623..aabf18db 100644
--- a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# Besnik Bleta , 2012.
-# FIRST AUTHOR , 2012.
+# Besnik , 2012-2013
+# FIRST AUTHOR , 2012
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-05 00:04+0000\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+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,34 +20,39 @@ msgstr ""
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "Emër përdoruesi"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: 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:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "Adresë email"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr "Emër përdoruesi ose email"
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr "Emër përdoruesi ose adresë email e pavlefshme."
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr "Kjo fushë nuk është për adresa email."
+
+#: mediagoblin/auth/tools.py:33
+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."
@@ -60,54 +65,54 @@ msgstr "Na ndjeni, ka tashmë një përdorues me këtë emër."
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:174
+#: mediagoblin/auth/views.py:182
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:180
+#: mediagoblin/auth/views.py:188
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:198
+#: mediagoblin/auth/views.py:206
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:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr "Thuajse e keni verifikuar adresën tuaj email!"
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "Ridërgoni email-in tuaj të verifikimit."
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
msgid ""
"If that email address (case sensitive!) is registered an email has been sent"
" with instructions on how to change your password."
-msgstr ""
+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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
-msgstr ""
+msgstr "S'u gjet dot dikush me atë emër përdoruesi."
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
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:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
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:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -118,7 +123,7 @@ msgid "Description of this work"
msgstr "Përshkrim i kësaj pune"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -134,11 +139,11 @@ msgstr "Etiketa"
msgid "Separate tags by commas."
msgstr "Ndajini etiketat me presje."
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Identifikues"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "Identifikuesi s'mund të jetë i zbrazët"
@@ -166,45 +171,45 @@ msgid "This address contains errors"
msgstr "Kjo adresë përmban gabime"
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr "Fjalëkalimi i vjetër"
-
-#: mediagoblin/edit/forms.py:64
-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:67
-msgid "New password"
-msgstr "Fjalëkalimi i ri"
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
-msgstr ""
+msgstr "Parapëlqime licence"
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
-msgstr ""
+msgstr "Kjo do të jetë licenca juaj parazgjedhje për forma ngarkimesh."
-#: mediagoblin/edit/forms.py:82
+#: 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:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr "Titulli s'mund të jetë i zbrazët"
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 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:103
+#: mediagoblin/edit/forms.py:92
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/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr "Fjalëkalimi i vjetër"
+
+#: mediagoblin/edit/forms.py:101
+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
+msgid "New password"
+msgstr "Fjalëkalimi i ri"
+
+#: mediagoblin/edit/views.py:67
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."
@@ -219,7 +224,7 @@ msgstr "Shtuat bashkangjitjen %s!"
#: mediagoblin/edit/views.py:182
msgid "You can only edit your own profile."
-msgstr ""
+msgstr "Mund të përpunoni vetëm profilin tuaj."
#: mediagoblin/edit/views.py:188
msgid "You are editing a user's profile. Proceed with caution."
@@ -229,57 +234,80 @@ msgstr "Po përpunoni profilin e një përdoruesi. Hapni sytë."
msgid "Profile changes saved"
msgstr "Ndryshimet e profilit u ruajtën"
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr "Fjalëkalim i gabuar"
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr "Rregullimet e llogarisë u ruajtën"
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
-msgstr ""
+msgstr "Lypset të ripohoni fshirjen e llogarisë suaj."
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
-msgstr "Keni tashmë një koleksion të quajtur \"%s\"!"
+msgstr "Keni tashmë një koleksion të quajtur \"%s\"!"
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
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:343
+#: mediagoblin/edit/views.py:329
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/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr "Fjalëkalim i gabuar"
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+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"
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr "Nuk ka drejtori asetesh për këtë temë\n"
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr "Sidoqoftë, u gjet simlidhje e vjetër drejtorie lidhjesh; u hoq.\n"
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
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 ""
+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:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr "Na ndjeni, nuk e mbullojmë këtë lloj kartele :("
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr "Ndërkodimi i videos dështoi"
@@ -346,17 +374,17 @@ 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:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr "Klienti {0} u regjistrua!"
#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22
msgid "OAuth client connections"
-msgstr ""
+msgstr "Lidhje klienti OAuth"
#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22
msgid "Your OAuth clients"
-msgstr ""
+msgstr "Klientët tuaj OAuth"
#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
#: mediagoblin/templates/mediagoblin/submit/collection.html:30
@@ -365,7 +393,7 @@ msgstr ""
msgid "Add"
msgstr "Shtoni"
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr "Kartelë e gabuar e dhënë për llojin e medias."
@@ -373,118 +401,71 @@ msgstr "Kartelë e gabuar e dhënë për llojin e medias."
msgid "File"
msgstr "Kartelë"
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr "Duhet të jepni një kartelë."
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr "Yhaaaaaa! U parashtrua!"
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr "U shtua koleksioni \"%s\"!"
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr "Verifikoni email-in tuaj!"
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr "dilni"
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
msgstr "Llogaria e %(user_name)s"
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr "Ndryshoni rregullime llogarie"
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26
msgid "Media processing panel"
-msgstr "Paneli i Përpunimit të Medias"
+msgstr "Paneli i përpunimit të medias"
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
-msgstr ""
+msgstr "Dilni"
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Shtoni media"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "Krijoni koleksion të ri"
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr "Hedhur në qarkullim sipas AGPL-së. Kodi burim është i passhëm."
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr "Eksploroni"
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "Tungjatjeta juaj, mirë se vini te ky site MediaGoblin!"
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr "Ky site përdor MediaGoblin, një program jashtëzakonisht i shkëlqyer për strehim mediash."
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-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/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr "Nuk keni ende një të tillë? Ãshtë e lehtë!"
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "Krijoni një llogarin te ky site\n ose\n Instaloni dhe rregulloni MediaGoblin-in te shërbyesi juaj"
+msgstr "Figurë e gungaçi duke bërë shtriqje"
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr "Mediat më të reja"
@@ -515,7 +496,7 @@ msgstr "Pa zëra të dështuar!"
#: mediagoblin/templates/mediagoblin/admin/panel.html:92
msgid "Last 10 successful uploads"
-msgstr "10 Ngarkimet e Fundit të Suksesshme"
+msgstr "10 ngarkimet e fundit të suksesshme"
#: mediagoblin/templates/mediagoblin/admin/panel.html:112
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
@@ -590,6 +571,53 @@ msgid ""
"%(verification_url)s"
msgstr "Njatjeta %(username)s,\n\nqë të aktivizoni llogarinë tuaj te GNU MediaGoblin hapeni URL-në vijuese te\nshfletuesi juaj web:\n\n%(verification_url)s"
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr "Bazuar në MediaGoblin, një projekt GNU."
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr "Hedhur në qarkullim sipas AGPL-së. Kodi burim është i passhëm."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr "Eksploroni"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "Tungjatjeta juaj, mirë se vini te ky site MediaGoblin!"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr "Ky site përdor MediaGoblin, një program jashtëzakonisht i shkëlqyer për strehim mediash."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+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
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -602,13 +630,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:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr "Bashkangjitje"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr "Shtoni bashkangjitje"
@@ -625,23 +653,33 @@ msgstr "Anuloje"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
-msgstr ""
+msgstr "Të fshihet vërtet përdoruesi '%(user_name)s' dhe krejt media/komentet përkatëse?"
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35
msgid "Yes, really delete my account"
-msgstr ""
+msgstr "Po, fshijeni vërtet llogarinë time"
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "Fshije përgjithmonë"
@@ -658,10 +696,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:59
-msgid "Delete my account"
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
msgstr ""
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+msgid "Delete my account"
+msgstr "Fshije llogarinë time"
+
#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
#, python-format
msgid "Editing %(collection_title)s"
@@ -683,6 +725,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/video.html:55
msgid "Download"
@@ -707,6 +750,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/video.html:61
msgid "Original file"
msgstr "Kartela origjinale"
@@ -715,6 +759,7 @@ msgstr "Kartela origjinale"
msgid "WebM file (Vorbis codec)"
msgstr "Kartelë WebM (kodek Vorbis)"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -725,9 +770,13 @@ 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
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
-msgstr ""
+msgstr "Aktivizoni/Ãaktivizoni Rrotullimin"
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
msgid "Perspective"
@@ -770,14 +819,14 @@ msgid ""
"Sorry, this video will not work because\n"
" your web browser does not support HTML5 \n"
" video."
-msgstr ""
+msgstr "Na ndjeni, kjo video nuk do të punojë ngaqë\n shfletuesi juaj web nuk mbulon videot\n HTML5."
#: 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 ""
+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)"
@@ -823,19 +872,19 @@ msgstr "Të fshihet vërtet %(title)s?"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr "Të hiqet vërtet %(media_title)s nga %(collection_title)s?"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr "Hiqe"
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21
#, python-format
msgid "%(username)s's collections"
-msgstr ""
+msgstr "Koleksione të %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28
#, python-format
msgid "%(username)s's collections"
-msgstr ""
+msgstr "Koleksione të %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
#, python-format
@@ -854,7 +903,7 @@ msgstr "Media nga %(username)s"
msgid ""
"%(username)s's media with tag %(tag)s"
-msgstr ""
+msgstr "Media të %(username)s me etiketën %(tag)s"
#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48
#, python-format
@@ -866,30 +915,34 @@ 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:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr "Shtoni një koment"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr "Shtoje këtë koment"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
-msgstr "te"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
+#: 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 ""
-"Added on
\n"
-" %(date)s
"
-msgstr "Shtuar më
\n %(date)s
"
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+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
msgid "Add â%(media_title)sâ to a collection"
-msgstr ""
+msgstr "Shtojeni â%(media_title)sâ te një koleksion"
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54
msgid "+"
@@ -968,7 +1021,7 @@ msgstr "Ky përdorues nuk e ka plotësuar (ende) profilin e vet."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:124
msgid "Browse collections"
-msgstr ""
+msgstr "Shfletoni koleksionet"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:137
#, python-format
@@ -993,11 +1046,11 @@ msgstr "(hiqe)"
#: mediagoblin/templates/mediagoblin/utils/collections.html:21
msgid "Collected in"
-msgstr ""
+msgstr "Pjesë e koleksionit"
#: mediagoblin/templates/mediagoblin/utils/collections.html:40
msgid "Add to a collection"
-msgstr ""
+msgstr "Shtoje te një koleksion"
#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
@@ -1039,7 +1092,7 @@ msgstr "më të vjetra"
msgid "Tagged with"
msgstr "Etiketuar me"
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr "Nuk lexoi dot kartelën e figurës."
@@ -1069,9 +1122,33 @@ msgid ""
" deleted."
msgstr "Nuk duket se ka ndonjë faqe në këtë adresë. Na ndjeni!
Nëse jeni i sigurt se kjo adresë është e saktë, ndoshta faqja që po kërkoni është lëvizur ose fshirë."
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
-msgstr ""
+msgstr "Koment"
#: mediagoblin/user_pages/forms.py:25
msgid ""
@@ -1090,7 +1167,7 @@ msgstr "Jam i sigurt se dua që të hiqet ky objekt prek koleksioni"
#: mediagoblin/user_pages/forms.py:39
msgid "Collection"
-msgstr ""
+msgstr "Koleksion"
#: mediagoblin/user_pages/forms.py:40
msgid "-- Select --"
@@ -1100,73 +1177,77 @@ msgstr "-- Përzgjidhni --"
msgid "Include a note"
msgstr "Përfshini një shënim"
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr "komentoi te postimi juaj"
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr "Hmmm, komenti juaj qe i zbrazët."
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr "Komenti juaj u postua!"
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr "Ju lutemi, kontrolloni zërat tuaj dhe riprovoni."
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr "Duhet të përzgjidhni ose shtoni një koleksion"
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "\"%s\" gjendet tashmë te koleksioni \"%s\""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "\"%s\" u shtua te koleksioni \"%s\""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr "E fshitë median."
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
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:301
+#: mediagoblin/user_pages/views.py:296
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:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr "E fshitë objektin prej koleksionit."
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
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:389
+#: mediagoblin/user_pages/views.py:382
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:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "E fshitë koleksionin \"%s\""
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
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:439
+#: mediagoblin/user_pages/views.py:430
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 f6918f71..5564d35d 100644
Binary files a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po
index d482151d..fcf8a666 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-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-05 00:04+0000\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+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,32 +18,37 @@ 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:28
-msgid "Invalid User name or email address."
+#: mediagoblin/auth/forms.py:26
+msgid "Username"
msgstr ""
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
msgstr ""
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
+#: mediagoblin/auth/forms.py:34
+msgid "Email address"
msgstr ""
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
-msgid "Username"
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
msgstr ""
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
-msgid "Password"
+#: mediagoblin/auth/forms.py:52
+msgid "Username or email"
msgstr ""
-#: mediagoblin/auth/forms.py:60
-msgid "Email address"
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
msgstr ""
-#: mediagoblin/auth/forms.py:78
-msgid "Username or email"
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:33
+msgid "This field requires an email address."
msgstr ""
#: mediagoblin/auth/views.py:54
@@ -58,54 +63,54 @@ msgstr ""
msgid "Sorry, a user with that email address already exists."
msgstr ""
-#: mediagoblin/auth/views.py:174
+#: mediagoblin/auth/views.py:182
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr ""
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
msgstr ""
-#: mediagoblin/auth/views.py:198
+#: mediagoblin/auth/views.py:206
msgid "You must be logged in so we know who to send the email to!"
msgstr ""
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr ""
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr ""
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -116,7 +121,7 @@ msgid "Description of this work"
msgstr ""
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -132,11 +137,11 @@ msgstr ""
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr ""
@@ -164,45 +169,45 @@ msgid "This address contains errors"
msgstr ""
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:64
-msgid "Enter your old password to prove you own this account."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:67
-msgid "New password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:82
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr ""
-#: mediagoblin/edit/forms.py:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:103
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:101
+msgid "Enter your old password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:104
+msgid "New password"
+msgstr ""
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr ""
@@ -227,44 +232,63 @@ msgstr ""
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr ""
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:343
+#: mediagoblin/edit/views.py:329
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr ""
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr ""
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
@@ -272,12 +296,16 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr ""
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr ""
@@ -344,7 +372,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr ""
@@ -363,7 +391,7 @@ msgstr ""
msgid "Add"
msgstr ""
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr ""
@@ -371,45 +399,45 @@ msgstr ""
msgid "File"
msgstr ""
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr ""
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr ""
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -417,72 +445,25 @@ msgstr ""
msgid "Media processing panel"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr ""
@@ -588,6 +569,53 @@ msgid ""
"%(verification_url)s"
msgstr ""
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+msgid "Don't have one yet? It's easy!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
+#, python-format
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -600,13 +628,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr ""
@@ -623,12 +651,22 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -639,7 +677,7 @@ msgid "Yes, really delete my account"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr ""
@@ -656,7 +694,11 @@ msgstr ""
msgid "Changing %(username)s's account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr ""
@@ -681,6 +723,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/video.html:55
msgid "Download"
@@ -705,6 +748,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr ""
@@ -713,6 +757,7 @@ msgstr ""
msgid "WebM file (Vorbis codec)"
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
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -723,6 +768,10 @@ msgstr ""
msgid "Image for %(media_title)s"
msgstr ""
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr ""
@@ -821,7 +870,7 @@ msgstr ""
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr ""
@@ -864,23 +913,27 @@ msgstr ""
msgid "â Browsing media by %(username)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
+#: 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 ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
-#, python-format
-msgid ""
-"Added on
\n"
-" %(date)s
"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+msgid "Added"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
+msgid "Created"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
@@ -1037,7 +1090,7 @@ msgstr ""
msgid "Tagged with"
msgstr ""
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr ""
@@ -1067,6 +1120,30 @@ msgid ""
" deleted."
msgstr ""
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr ""
@@ -1098,73 +1175,77 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr ""
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr ""
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr ""
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr ""
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
msgid "The media was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:301
+#: mediagoblin/user_pages/views.py:296
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:389
+#: mediagoblin/user_pages/views.py:382
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:439
+#: mediagoblin/user_pages/views.py:430
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 28ea51f8..3b961e60 100644
Binary files a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po
index 76bda505..659de21b 100644
--- a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# , 2011.
-# , 2011, 2012.
+# ingenman , 2011
+# joar , 2011, 2012
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-05 00:04+0000\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/mediagoblin/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -20,34 +20,39 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "Användarnamn"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: 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:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "E-postadress"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr ""
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:33
+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."
@@ -60,54 +65,54 @@ msgstr "En användare med det användarnamnet finns redan."
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:174
+#: mediagoblin/auth/views.py:182
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:180
+#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
msgstr "Verifieringsnyckeln eller användar-IDt är fel."
-#: mediagoblin/auth/views.py:198
+#: mediagoblin/auth/views.py:206
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:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr "Du har redan verifierat din e-postadress!"
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "Skickade ett nytt verifierings-email."
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -118,7 +123,7 @@ msgid "Description of this work"
msgstr "Beskrivning av verket"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -134,11 +139,11 @@ msgstr "Taggar"
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "Sökvägsnamn"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "Sökvägsnamnet kan inte vara tomt"
@@ -166,45 +171,45 @@ msgid "This address contains errors"
msgstr ""
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr "Tidigare lösenord"
-
-#: mediagoblin/edit/forms.py:64
-msgid "Enter your old password to prove you own this account."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:67
-msgid "New password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:82
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr ""
-#: mediagoblin/edit/forms.py:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:103
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr "Tidigare lösenord"
+
+#: mediagoblin/edit/forms.py:101
+msgid "Enter your old password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:104
+msgid "New password"
+msgstr ""
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr "Ett inlägg med det sökvägsnamnet existerar redan."
@@ -229,44 +234,63 @@ msgstr "Var försiktig, du redigerar en annan användares profil."
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr "Fel lösenord"
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:343
+#: mediagoblin/edit/views.py:329
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr "Fel lösenord"
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr ""
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
@@ -274,12 +298,16 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr ""
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr ""
@@ -346,7 +374,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr ""
@@ -365,7 +393,7 @@ msgstr ""
msgid "Add"
msgstr ""
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr "Ogiltig fil för mediatypen."
@@ -373,45 +401,45 @@ msgstr "Ogiltig fil för mediatypen."
msgid "File"
msgstr "Fil"
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr "Du måste ange en fil"
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr "Tjohoo! Upladdat!"
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr "Verifiera din e-postadress"
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -419,72 +447,25 @@ msgstr ""
msgid "Media processing panel"
msgstr "Mediabehandlingspanel"
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "Lägg till media"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr "Utforska"
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "Hej, välkommen till den här MediaGoblin-sidan!"
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr "Har du inte ett redan?"
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr "Senast medier"
@@ -590,6 +571,53 @@ msgid ""
"%(verification_url)s"
msgstr "Hej %(username)s,\n\nöppna den följande webbadressen i din webbläsare för att aktivera ditt konto på GNU MediaGoblin:\n\n%(verification_url)s"
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr "Utforska"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "Hej, välkommen till den här MediaGoblin-sidan!"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+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
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -602,13 +630,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr ""
@@ -625,12 +653,22 @@ msgstr "Avbryt"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -641,7 +679,7 @@ msgid "Yes, really delete my account"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr ""
@@ -658,7 +696,11 @@ msgstr "Redigerar %(media_title)s"
msgid "Changing %(username)s's account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr ""
@@ -683,6 +725,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/video.html:55
msgid "Download"
@@ -707,6 +750,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr ""
@@ -715,6 +759,7 @@ msgstr ""
msgid "WebM file (Vorbis codec)"
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
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -725,6 +770,10 @@ msgstr ""
msgid "Image for %(media_title)s"
msgstr ""
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr ""
@@ -823,7 +872,7 @@ msgstr "Vill du verkligen radera %(title)s?"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr ""
@@ -866,23 +915,27 @@ msgstr "%(username)ss media"
msgid "â Browsing media by %(username)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
+#: 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 ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
-#, python-format
-msgid ""
-"Added on
\n"
-" %(date)s
"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+msgid "Added"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
+msgid "Created"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
@@ -1039,7 +1092,7 @@ msgstr ""
msgid "Tagged with"
msgstr ""
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr ""
@@ -1069,6 +1122,30 @@ msgid ""
" deleted."
msgstr ""
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr ""
@@ -1100,73 +1177,77 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr ""
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr ""
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr ""
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr ""
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
msgid "The media was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:301
+#: mediagoblin/user_pages/views.py:296
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:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:389
+#: mediagoblin/user_pages/views.py:382
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:439
+#: mediagoblin/user_pages/views.py:430
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 8cef4593..6e7ebd21 100644
Binary files a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po
index 3586ee78..b0bf1aa1 100644
--- a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# à°µà±à°µà±à°¨à± , 2011.
+# à°µà±à°µà±à°¨à± , 2011
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-05 00:04+0000\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+0000\n"
"Last-Translator: cwebber \n"
-"Language-Team: LANGUAGE \n"
+"Language-Team: Telugu (http://www.transifex.com/projects/p/mediagoblin/language/te/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -19,34 +19,39 @@ msgstr ""
"Language: te\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "వాడà±à°à°°à°¿ à°ªà±à°°à±"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
msgid "Password"
msgstr "à°¸à°à°à±à°¤à°ªà°¦à°"
-#: mediagoblin/auth/forms.py:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr ""
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:33
+msgid "This field requires an email address."
+msgstr ""
+
#: mediagoblin/auth/views.py:54
msgid "Sorry, registration is disabled on this instance."
msgstr ""
@@ -59,54 +64,54 @@ msgstr ""
msgid "Sorry, a user with that email address already exists."
msgstr ""
-#: mediagoblin/auth/views.py:174
+#: mediagoblin/auth/views.py:182
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr ""
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
msgstr ""
-#: mediagoblin/auth/views.py:198
+#: mediagoblin/auth/views.py:206
msgid "You must be logged in so we know who to send the email to!"
msgstr ""
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr ""
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr ""
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -117,7 +122,7 @@ msgid "Description of this work"
msgstr ""
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -133,11 +138,11 @@ msgstr ""
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr ""
@@ -165,45 +170,45 @@ msgid "This address contains errors"
msgstr ""
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:64
-msgid "Enter your old password to prove you own this account."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:67
-msgid "New password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:82
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr ""
-#: mediagoblin/edit/forms.py:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:103
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:101
+msgid "Enter your old password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:104
+msgid "New password"
+msgstr ""
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr ""
@@ -228,44 +233,63 @@ msgstr ""
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr ""
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:343
+#: mediagoblin/edit/views.py:329
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr ""
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr ""
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
@@ -273,12 +297,16 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr ""
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr ""
@@ -345,7 +373,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr ""
@@ -364,7 +392,7 @@ msgstr ""
msgid "Add"
msgstr ""
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr ""
@@ -372,45 +400,45 @@ msgstr ""
msgid "File"
msgstr ""
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr ""
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr ""
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -418,72 +446,25 @@ msgstr ""
msgid "Media processing panel"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr ""
@@ -589,6 +570,53 @@ msgid ""
"%(verification_url)s"
msgstr ""
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+msgid "Don't have one yet? It's easy!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
+#, python-format
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -601,13 +629,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr ""
@@ -624,12 +652,22 @@ msgstr "à°°à°¦à±à°¦à±à°à±à°¯à°¿"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -640,7 +678,7 @@ msgid "Yes, really delete my account"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr ""
@@ -657,7 +695,11 @@ msgstr ""
msgid "Changing %(username)s's account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr ""
@@ -682,6 +724,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/video.html:55
msgid "Download"
@@ -706,6 +749,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr ""
@@ -714,6 +758,7 @@ msgstr ""
msgid "WebM file (Vorbis codec)"
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
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -724,6 +769,10 @@ msgstr ""
msgid "Image for %(media_title)s"
msgstr ""
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr ""
@@ -822,7 +871,7 @@ msgstr ""
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr ""
@@ -865,23 +914,27 @@ msgstr ""
msgid "â Browsing media by %(username)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
+#: 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 ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
-#, python-format
-msgid ""
-"Added on
\n"
-" %(date)s
"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+msgid "Added"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
+msgid "Created"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
@@ -1038,7 +1091,7 @@ msgstr ""
msgid "Tagged with"
msgstr ""
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr ""
@@ -1068,6 +1121,30 @@ msgid ""
" deleted."
msgstr ""
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr ""
@@ -1099,73 +1176,77 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr ""
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr ""
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr ""
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr ""
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
msgid "The media was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:301
+#: mediagoblin/user_pages/views.py:296
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:389
+#: mediagoblin/user_pages/views.py:382
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:439
+#: mediagoblin/user_pages/views.py:430
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 d75d2eb2..c234ff00 100644
Binary files a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po
index a5e95640..a7ee8db6 100644
--- a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-05 00:04+0000\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+0000\n"
"Last-Translator: cwebber \n"
"Language-Team: Chinese (Taiwan) (Big5) (http://www.transifex.com/projects/p/mediagoblin/language/zh_TW.Big5/)\n"
"MIME-Version: 1.0\n"
@@ -18,32 +18,37 @@ msgstr ""
"Language: zh_TW.Big5\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
+#: mediagoblin/auth/forms.py:26
+msgid "Username"
msgstr ""
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
msgstr ""
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
+#: mediagoblin/auth/forms.py:34
+msgid "Email address"
msgstr ""
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
-msgid "Username"
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
msgstr ""
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
-msgid "Password"
+#: mediagoblin/auth/forms.py:52
+msgid "Username or email"
msgstr ""
-#: mediagoblin/auth/forms.py:60
-msgid "Email address"
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
msgstr ""
-#: mediagoblin/auth/forms.py:78
-msgid "Username or email"
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:33
+msgid "This field requires an email address."
msgstr ""
#: mediagoblin/auth/views.py:54
@@ -58,54 +63,54 @@ msgstr ""
msgid "Sorry, a user with that email address already exists."
msgstr ""
-#: mediagoblin/auth/views.py:174
+#: mediagoblin/auth/views.py:182
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr ""
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
msgstr ""
-#: mediagoblin/auth/views.py:198
+#: mediagoblin/auth/views.py:206
msgid "You must be logged in so we know who to send the email to!"
msgstr ""
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr ""
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr ""
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr ""
-#: mediagoblin/auth/views.py:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
msgid "You can now log in using your new password."
msgstr ""
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -116,7 +121,7 @@ msgid "Description of this work"
msgstr ""
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -132,11 +137,11 @@ msgstr ""
msgid "Separate tags by commas."
msgstr ""
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr ""
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr ""
@@ -164,45 +169,45 @@ msgid "This address contains errors"
msgstr ""
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:64
-msgid "Enter your old password to prove you own this account."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:67
-msgid "New password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:82
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr ""
-#: mediagoblin/edit/forms.py:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr ""
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr ""
-#: mediagoblin/edit/forms.py:103
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr ""
-#: mediagoblin/edit/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:101
+msgid "Enter your old password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:104
+msgid "New password"
+msgstr ""
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr ""
@@ -227,44 +232,63 @@ msgstr ""
msgid "Profile changes saved"
msgstr ""
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr ""
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr ""
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr ""
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
msgid "A collection with that slug already exists for this user."
msgstr ""
-#: mediagoblin/edit/views.py:343
+#: mediagoblin/edit/views.py:329
msgid "You are editing another user's collection. Proceed with caution."
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr ""
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr ""
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr ""
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
@@ -272,12 +296,16 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr ""
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr ""
@@ -344,7 +372,7 @@ msgstr ""
msgid "This field is required for public clients"
msgstr ""
-#: mediagoblin/plugins/oauth/views.py:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr ""
@@ -363,7 +391,7 @@ msgstr ""
msgid "Add"
msgstr ""
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr ""
@@ -371,45 +399,45 @@ msgstr ""
msgid "File"
msgstr ""
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr ""
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr ""
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -417,72 +445,25 @@ msgstr ""
msgid "Media processing panel"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr ""
@@ -588,6 +569,53 @@ msgid ""
"%(verification_url)s"
msgstr ""
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+msgid "Don't have one yet? It's easy!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
+#, python-format
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -600,13 +628,13 @@ msgid "Editing attachments for %(media_title)s"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr ""
@@ -623,12 +651,22 @@ msgstr ""
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -639,7 +677,7 @@ msgid "Yes, really delete my account"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr ""
@@ -656,7 +694,11 @@ msgstr ""
msgid "Changing %(username)s's account settings"
msgstr ""
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr ""
@@ -681,6 +723,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/video.html:55
msgid "Download"
@@ -705,6 +748,7 @@ msgid ""
msgstr ""
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71
#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
msgid "Original file"
msgstr ""
@@ -713,6 +757,7 @@ msgstr ""
msgid "WebM file (Vorbis codec)"
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
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -723,6 +768,10 @@ msgstr ""
msgid "Image for %(media_title)s"
msgstr ""
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr ""
@@ -821,7 +870,7 @@ msgstr ""
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr ""
@@ -864,23 +913,27 @@ msgstr ""
msgid "â Browsing media by %(username)s"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
+#: 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 ""
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
-#, python-format
-msgid ""
-"Added on
\n"
-" %(date)s
"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+msgid "Added"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:161
+msgid "Created"
msgstr ""
#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
@@ -1037,7 +1090,7 @@ msgstr ""
msgid "Tagged with"
msgstr ""
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr ""
@@ -1067,6 +1120,30 @@ msgid ""
" deleted."
msgstr ""
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr ""
@@ -1098,73 +1175,77 @@ msgstr ""
msgid "Include a note"
msgstr ""
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr ""
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr ""
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr ""
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr ""
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr ""
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr ""
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
msgid "The media was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:301
+#: mediagoblin/user_pages/views.py:296
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr ""
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
msgid "The item was not removed because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:389
+#: mediagoblin/user_pages/views.py:382
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr ""
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr ""
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr ""
-#: mediagoblin/user_pages/views.py:439
+#: mediagoblin/user_pages/views.py:430
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr ""
diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo
index 3d267cfc..3fd4911a 100644
Binary files a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po
index bd50df78..e2a8e680 100644
--- a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po
@@ -3,17 +3,17 @@
# This file is distributed under the same license as the PROJECT project.
#
# Translators:
-# , 2011.
-# Harry Chen , 2011-2012.
-# , 2012.
+# , 2011
+# Harry Chen , 2011-2012
+# medicalwei , 2012
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-03-04 18:04-0600\n"
-"PO-Revision-Date: 2013-03-05 00:04+0000\n"
+"POT-Creation-Date: 2013-05-27 13:54-0500\n"
+"PO-Revision-Date: 2013-05-27 18:54+0000\n"
"Last-Translator: cwebber \n"
-"Language-Team: LANGUAGE \n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/mediagoblin/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -21,34 +21,39 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: mediagoblin/auth/forms.py:28
-msgid "Invalid User name or email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:29
-msgid "This field does not take email addresses."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:30
-msgid "This field requires an email address."
-msgstr ""
-
-#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67
+#: mediagoblin/auth/forms.py:26
msgid "Username"
msgstr "使ç¨è
å稱"
-#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
+#: mediagoblin/tests/test_util.py:110
msgid "Password"
msgstr "å¯ç¢¼"
-#: mediagoblin/auth/forms.py:60
+#: mediagoblin/auth/forms.py:34
msgid "Email address"
msgstr "Email ä½å"
-#: mediagoblin/auth/forms.py:78
+#: mediagoblin/auth/forms.py:41
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:52
msgid "Username or email"
msgstr "使ç¨è
å稱æ email"
+#: mediagoblin/auth/tools.py:31
+msgid "Invalid User name or email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:32
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:33
+msgid "This field requires an email address."
+msgstr ""
+
#: mediagoblin/auth/views.py:54
msgid "Sorry, registration is disabled on this instance."
msgstr "æ±æï¼æ¬ç«å·²ç¶æ«å註åã"
@@ -61,54 +66,54 @@ msgstr "æ±æï¼éå使ç¨è
å稱已ç¶åå¨ã"
msgid "Sorry, a user with that email address already exists."
msgstr "æ±æï¼æ¤ email ä½ç½®å·²ç¶è¢«è¨»åäºã"
-#: mediagoblin/auth/views.py:174
+#: mediagoblin/auth/views.py:182
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "æ¨ç email ä½å已被èªèãæ¨å·²ç¶å¯ä»¥ç»å
¥ï¼ç·¨è¼¯æ¨çå人æªæ¡ä¸¦ä¸å³åçï¼"
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:188
msgid "The verification key or user id is incorrect"
msgstr "èªè碼ææ¯ä½¿ç¨è
ID é¯èª¤"
-#: mediagoblin/auth/views.py:198
+#: mediagoblin/auth/views.py:206
msgid "You must be logged in so we know who to send the email to!"
msgstr "æ¨å¿
é ç»å
¥ï¼æåæç¥éä¿¡è¦é給誰ï¼"
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:214
msgid "You've already verified your email address!"
msgstr "æ¨çé»åéµä»¶å·²ç¶ç¢ºèªäºï¼"
-#: mediagoblin/auth/views.py:219
+#: mediagoblin/auth/views.py:227
msgid "Resent your verification email."
msgstr "ééèªèä¿¡ã"
-#: mediagoblin/auth/views.py:250
+#: mediagoblin/auth/views.py:258
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:261
+#: mediagoblin/auth/views.py:269
msgid "Couldn't find someone with that username."
msgstr ""
-#: mediagoblin/auth/views.py:264
+#: mediagoblin/auth/views.py:272
msgid ""
"An email has been sent with instructions on how to change your password."
msgstr "ä¿®æ¹å¯ç¢¼çæ示已ç¶ç±é»åéµä»¶å¯éå°æ¨çä¿¡ç®±ã"
-#: mediagoblin/auth/views.py:271
+#: mediagoblin/auth/views.py:279
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:328
+#: mediagoblin/auth/views.py:336
msgid "You can now log in using your new password."
msgstr "æ¨ç¾å¨å¯ä»¥ç¨æ°çå¯ç¢¼ç»å
¥äºï¼"
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93
+#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
#: mediagoblin/user_pages/forms.py:45
msgid "Title"
@@ -119,7 +124,7 @@ msgid "Description of this work"
msgstr "éåä½åçæè¿°"
#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49
msgid ""
"You can use\n"
@@ -135,11 +140,11 @@ msgstr "æ¨ç±¤"
msgid "Separate tags by commas."
msgstr "ç¨éèåéæ¨ç±¤ã"
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101
+#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
msgid "Slug"
msgstr "簡稱"
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102
+#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
msgid "The slug can't be empty"
msgstr "簡稱ä¸è½çºç©ºç½"
@@ -167,45 +172,45 @@ msgid "This address contains errors"
msgstr "æ¬ç¶²ååºé¯äº"
#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr "èçå¯ç¢¼"
-
-#: mediagoblin/edit/forms.py:64
-msgid "Enter your old password to prove you own this account."
-msgstr "輸å
¥æ¨çèå¯ç¢¼ä¾èææ¨ææéå帳èã"
-
-#: mediagoblin/edit/forms.py:67
-msgid "New password"
-msgstr "æ°å¯ç¢¼"
-
-#: mediagoblin/edit/forms.py:74
msgid "License preference"
msgstr ""
-#: mediagoblin/edit/forms.py:80
+#: mediagoblin/edit/forms.py:69
msgid "This will be your default license on upload forms."
msgstr ""
-#: mediagoblin/edit/forms.py:82
+#: mediagoblin/edit/forms.py:71
msgid "Email me when others comment on my media"
msgstr "ç¶æ人å°æçåªé«è©è«æå¯ä¿¡çµ¦æ"
-#: mediagoblin/edit/forms.py:94
+#: mediagoblin/edit/forms.py:83
msgid "The title can't be empty"
msgstr "æ¨é¡ä¸è½æ¯ç©ºç"
-#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
#: mediagoblin/user_pages/forms.py:48
msgid "Description of this collection"
msgstr "éåèèçæè¿°"
-#: mediagoblin/edit/forms.py:103
+#: mediagoblin/edit/forms.py:92
msgid ""
"The title part of this collection's address. You usually don't need to "
"change this."
msgstr "æ¤èè網åçæ¨é¡é¨ä»½ï¼é常ä¸éè¦ä¿®æ¹ã"
-#: mediagoblin/edit/views.py:66
+#: mediagoblin/edit/forms.py:99
+msgid "Old password"
+msgstr "èçå¯ç¢¼"
+
+#: mediagoblin/edit/forms.py:101
+msgid "Enter your old password to prove you own this account."
+msgstr "輸å
¥æ¨çèå¯ç¢¼ä¾èææ¨ææéå帳èã"
+
+#: mediagoblin/edit/forms.py:104
+msgid "New password"
+msgstr "æ°å¯ç¢¼"
+
+#: mediagoblin/edit/views.py:67
msgid "An entry with that slug already exists for this user."
msgstr "éå簡稱已ç¶è¢«å
¶ä»äººç¨äº"
@@ -230,44 +235,63 @@ msgstr "æ¨æ£å¨ä¿®æ¹å¥äººçå人æªæ¡ï¼è«å°å¿æä½ã"
msgid "Profile changes saved"
msgstr "å人æªæ¡ä¿®æ¹å·²å²å"
-#: mediagoblin/edit/views.py:241
-msgid "Wrong password"
-msgstr "å¯ç¢¼é¯èª¤"
-
-#: mediagoblin/edit/views.py:252
+#: mediagoblin/edit/views.py:240
msgid "Account settings saved"
msgstr "帳èè¨å®å·²å²å"
-#: mediagoblin/edit/views.py:286
+#: mediagoblin/edit/views.py:274
msgid "You need to confirm the deletion of your account."
msgstr ""
-#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142
-#: mediagoblin/user_pages/views.py:214
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
#, python-format
msgid "You already have a collection called \"%s\"!"
msgstr "æ¨å·²ç¶æä¸å稱åã%sãçèèäºï¼"
-#: mediagoblin/edit/views.py:326
+#: mediagoblin/edit/views.py:314
msgid "A collection with that slug already exists for this user."
msgstr "éå使ç¨è
å·²ç¶æ使ç¨è©²ç°¡ç¨±çèèäºã"
-#: mediagoblin/edit/views.py:343
+#: mediagoblin/edit/views.py:329
msgid "You are editing another user's collection. Proceed with caution."
msgstr "æ¨æ£å¨ä¿®æ¹å¥äººçèèï¼è«å°å¿æä½ã"
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:348
+msgid "Wrong password"
+msgstr "å¯ç¢¼é¯èª¤"
+
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
msgid "Cannot link theme... no theme set\n"
msgstr "ç¡æ³é£çµä½æ¯â¦æ²ææ¤ä½æ¯\n"
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
msgid "No asset directory for this theme\n"
msgstr "æ¤ä½æ¯æ²æç´ æç®é\n"
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
msgid "However, old link directory symlink found; removed.\n"
msgstr "ä½æ¯èçç®éé£çµå·²ç¶æ¾å°ä¸¦ç§»é¤ã\n"
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
#: mediagoblin/meddleware/csrf.py:134
msgid ""
"CSRF cookie not present. This is most likely the result of a cookie blocker "
@@ -275,12 +299,16 @@ msgid ""
"domain."
msgstr ""
-#: mediagoblin/media_types/__init__.py:61
-#: mediagoblin/media_types/__init__.py:102
+#: mediagoblin/media_types/__init__.py:111
+#: mediagoblin/media_types/__init__.py:155
msgid "Sorry, I don't support that file type :("
msgstr "æ±æï¼æä¸æ¯æ´é樣çæªæ¡æ ¼å¼ :("
-#: mediagoblin/media_types/video/processing.py:36
+#: mediagoblin/media_types/pdf/processing.py:136
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:37
msgid "Video transcoding failed"
msgstr "å½±åè½ç¢¼å¤±æ"
@@ -347,7 +375,7 @@ msgstr "æ¤æç¨ç¨å¼çéå®å URIï¼æ¬æ¬ä½å¨å
¬éé¡åç OAuth clie
msgid "This field is required for public clients"
msgstr "æ¬æ¬ä½å¨å
¬éé¡åç OAuth client çºå¿
å¡«"
-#: mediagoblin/plugins/oauth/views.py:59
+#: mediagoblin/plugins/oauth/views.py:56
msgid "The client {0} has been registered!"
msgstr "OAuth client {0} 註åå®æï¼"
@@ -366,7 +394,7 @@ msgstr ""
msgid "Add"
msgstr "å¢å "
-#: mediagoblin/processing/__init__.py:172
+#: mediagoblin/processing/__init__.py:193
msgid "Invalid file given for media type."
msgstr "æå®é¯èª¤çåªé«é¡å¥ï¼"
@@ -374,45 +402,45 @@ msgstr "æå®é¯èª¤çåªé«é¡å¥ï¼"
msgid "File"
msgstr "æªæ¡"
-#: mediagoblin/submit/views.py:51
+#: mediagoblin/submit/views.py:49
msgid "You must provide a file."
msgstr "æ¨å¿
é æä¾ä¸åæªæ¡"
-#: mediagoblin/submit/views.py:97
+#: mediagoblin/submit/views.py:93
msgid "Woohoo! Submitted!"
msgstr "ååï¼PO ä¸å»å¦ï¼"
-#: mediagoblin/submit/views.py:146
+#: mediagoblin/submit/views.py:144
#, python-format
msgid "Collection \"%s\" added!"
msgstr "èèã%sãæ°å¢å®æï¼"
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:67
msgid "Verify your email!"
msgstr "確èªæ¨çé»åéµä»¶"
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:68
msgid "log out"
msgstr "ç»åº"
-#: mediagoblin/templates/mediagoblin/base.html:70
+#: 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:79
+#: mediagoblin/templates/mediagoblin/base.html:82
#, python-format
msgid "%(user_name)s's account"
msgstr "%(user_name)s ç帳è"
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:89
msgid "Change account settings"
msgstr "æ´æ¹å¸³èè¨å®"
-#: mediagoblin/templates/mediagoblin/base.html:90
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:108
#: mediagoblin/templates/mediagoblin/admin/panel.html:21
#: mediagoblin/templates/mediagoblin/admin/panel.html:26
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -420,72 +448,25 @@ msgstr "æ´æ¹å¸³èè¨å®"
msgid "Media processing panel"
msgstr "åªé«èçé¢æ¿"
-#: mediagoblin/templates/mediagoblin/base.html:93
+#: mediagoblin/templates/mediagoblin/base.html:96
msgid "Log out"
msgstr ""
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:99
#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
msgid "Add media"
msgstr "æ°å¢åªé«"
-#: mediagoblin/templates/mediagoblin/base.html:99
+#: mediagoblin/templates/mediagoblin/base.html:102
#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
msgid "Create new collection"
msgstr "æ°å¢æ°çèè"
-#: mediagoblin/templates/mediagoblin/base.html:122
-#, python-format
-msgid ""
-"Powered by MediaGoblin, a GNU project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:125
-#, python-format
-msgid ""
-"Released under the AGPL. Source code available."
-msgstr "以 AGPL ææ¬éåºãåæåå§ç¢¼ã"
-
#: mediagoblin/templates/mediagoblin/error.html:24
msgid "Image of goblin stressing out"
msgstr "滿èåèçå¥å¸æ"
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Explore"
-msgstr "æ¢ç´¢"
-
-#: mediagoblin/templates/mediagoblin/root.html:33
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "å¿ï¼æ¡è¿ä¾å° MediaGoblin ç«å°ï¼ "
-
-#: mediagoblin/templates/mediagoblin/root.html:35
-msgid ""
-"This site is running MediaGoblin, an "
-"extraordinarily great piece of media hosting software."
-msgstr "æ¬ç«ä½¿ç¨ MediaGoblin â èç¾ä¸åçåªé«å享網ç«ã"
-
-#: mediagoblin/templates/mediagoblin/root.html:36
-msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
-msgstr "æ¨å¯ä»¥ç»å
¥æ¨ç MediaGoblin 帳è以é²è¡ä¸å³åªé«ã張貼è©è«ççã"
-
-#: mediagoblin/templates/mediagoblin/root.html:38
-msgid "Don't have one yet? It's easy!"
-msgstr "æ²æ帳èåï¼é帳èå¾ç°¡å®ï¼"
-
-#: mediagoblin/templates/mediagoblin/root.html:39
-#, python-format
-msgid ""
-"Create an account at this site\n"
-" or\n"
-" Set up MediaGoblin on your own server"
-msgstr "å¨éå網ç«ä¸å»ºç«å¸³è\n ææ¯\n å¨èªå·±ç伺æå¨ä¸å»ºç« MediaGoblin"
-
-#: mediagoblin/templates/mediagoblin/root.html:47
+#: mediagoblin/templates/mediagoblin/root.html:32
msgid "Most recent media"
msgstr "ææ°çåªé«"
@@ -591,6 +572,53 @@ msgid ""
"%(verification_url)s"
msgstr "%(username)s æ¨å¥½ï¼\n\nè¦åå GNU MediaGoblin 帳èï¼è«å¨æ¨çç覽å¨ä¸æéä¸é¢ç網å:\n\n%(verification_url)s"
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by MediaGoblin, a GNU project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the AGPL. Source code available."
+msgstr "以 AGPL ææ¬éåºãåæåå§ç¢¼ã"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr "æ¢ç´¢"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "å¿ï¼æ¡è¿ä¾å° MediaGoblin ç«å°ï¼ "
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running MediaGoblin, an "
+"extraordinarily great piece of media hosting software."
+msgstr "æ¬ç«ä½¿ç¨ MediaGoblin â èç¾ä¸åçåªé«å享網ç«ã"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+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
+msgid "Don't have one yet? It's easy!"
+msgstr "æ²æ帳èåï¼é帳èå¾ç°¡å®ï¼"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
+#, python-format
+msgid ""
+"Create an account at this site\n"
+" or\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
msgid "MediaGoblin logo"
@@ -603,13 +631,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:159
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:175
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:198
msgid "Attachments"
msgstr "é件"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
msgid "Add attachment"
msgstr "æ°å¢é件"
@@ -626,12 +654,22 @@ msgstr "åæ¶"
#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:52
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55
#: 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
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
#, python-format
msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -642,7 +680,7 @@ msgid "Yes, really delete my account"
msgstr ""
#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
msgid "Delete permanently"
msgstr "æ°¸ä¹
åªé¤"
@@ -659,7 +697,11 @@ msgstr "編輯 %(media_title)s"
msgid "Changing %(username)s's account settings"
msgstr "æ£å¨æ¹è® %(username)s ç帳èè¨å®"
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
msgid "Delete my account"
msgstr ""
@@ -684,6 +726,7 @@ msgstr "æ¤åªé«è¢« tag æï¼%(tag_name)s"
#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
msgid "Download"
@@ -708,6 +751,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/video.html:61
msgid "Original file"
msgstr "åå§æªæ¡"
@@ -716,6 +760,7 @@ msgstr "åå§æªæ¡"
msgid "WebM file (Vorbis codec)"
msgstr "WebM æªæ¡ (Vorbis 編碼)"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
@@ -726,6 +771,10 @@ msgstr "WebM æªæ¡ (Vorbis 編碼)"
msgid "Image for %(media_title)s"
msgstr " %(media_title)s çç
§ç"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79
+msgid "PDF file"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
msgid "Toggle Rotate"
msgstr "åææè½"
@@ -824,7 +873,7 @@ msgstr "ççè¦åªé¤ %(title)s?"
msgid "Really remove %(media_title)s from %(collection_title)s?"
msgstr "確å®è¦å¾ %(collection_title)s ç§»é¤ %(media_title)s åï¼"
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
msgid "Remove"
msgstr "移é¤"
@@ -867,24 +916,28 @@ msgstr "%(username)s çåªé«"
msgid "â Browsing media by %(username)s"
msgstr "â ç覽 %(username)s çåªé«"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:94
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
msgid "Add a comment"
msgstr "æ°å¢è©è«"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
msgid "Add this comment"
msgstr "å¢å è©è«"
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:123
-msgid "at"
-msgstr "å¨"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:144
+#: 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 ""
-"Added on
\n"
-" %(date)s
"
-msgstr "å å
¥æ¥æ
\n %(date)s
"
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:150
+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
@@ -1040,7 +1093,7 @@ msgstr "æ´èç"
msgid "Tagged with"
msgstr "æ¨ç±¤"
-#: mediagoblin/tools/exif.py:80
+#: mediagoblin/tools/exif.py:83
msgid "Could not read the image file."
msgstr "ç¡æ³è®ååçæªæ¡ã"
@@ -1070,6 +1123,30 @@ msgid ""
" deleted."
msgstr "ä¸å¥½ææï¼çèµ·ä¾éå網åä¸æ²æ網é ã
å¦ææ¨ç¢ºå®éå網åæ¯æ£ç¢ºçï¼æ¨å¨å°æ¾çé é¢å¯è½å·²ç¶ç§»åææ¯è¢«åªé¤äºã"
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
#: mediagoblin/user_pages/forms.py:23
msgid "Comment"
msgstr ""
@@ -1101,73 +1178,77 @@ msgstr "â è«é¸æ â"
msgid "Include a note"
msgstr "å 註"
-#: mediagoblin/user_pages/lib.py:56
+#: mediagoblin/user_pages/lib.py:58
msgid "commented on your post"
msgstr "å¨æ¨çå
§å®¹å¼µè²¼è©è«"
-#: mediagoblin/user_pages/views.py:166
+#: mediagoblin/user_pages/views.py:169
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:174
msgid "Oops, your comment was empty."
msgstr "åï¼æ¨ççè¨æ¯ç©ºçã"
-#: mediagoblin/user_pages/views.py:172
+#: mediagoblin/user_pages/views.py:180
msgid "Your comment has been posted!"
msgstr "æ¨ççè¨å·²ç¶å¼µè²¼å®æï¼"
-#: mediagoblin/user_pages/views.py:197
+#: mediagoblin/user_pages/views.py:205
msgid "Please check your entries and try again."
msgstr "è«æª¢æ¥é
ç®ä¸¦é試ã"
-#: mediagoblin/user_pages/views.py:237
+#: mediagoblin/user_pages/views.py:245
msgid "You have to select or add a collection"
msgstr "æ¨éè¦é¸æææ¯æ°å¢ä¸åèè"
-#: mediagoblin/user_pages/views.py:248
+#: mediagoblin/user_pages/views.py:256
#, python-format
msgid "\"%s\" already in collection \"%s\""
msgstr "ã%sãå·²ç¶å¨ã%sãèè"
-#: mediagoblin/user_pages/views.py:264
+#: mediagoblin/user_pages/views.py:262
#, python-format
msgid "\"%s\" added to collection \"%s\""
msgstr "ã%sãå å
¥ã%sãèè"
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:282
msgid "You deleted the media."
msgstr "æ¨å·²ç¶åªé¤æ¤åªé«ã"
-#: mediagoblin/user_pages/views.py:293
+#: mediagoblin/user_pages/views.py:289
msgid "The media was not deleted because you didn't check that you were sure."
msgstr "ç±æ¼æ¨æ²æå¾é¸ç¢ºèªï¼è©²åªé«æ²æ被移é¤ã"
-#: mediagoblin/user_pages/views.py:301
+#: mediagoblin/user_pages/views.py:296
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "æ¨æ£å¨åªé¤å¥äººçåªé«ï¼è«å°å¿æä½ã"
-#: mediagoblin/user_pages/views.py:375
+#: mediagoblin/user_pages/views.py:370
msgid "You deleted the item from the collection."
msgstr "æ¨å·²ç¶å¾è©²èèä¸åªé¤è©²é
ç®ã"
-#: mediagoblin/user_pages/views.py:379
+#: mediagoblin/user_pages/views.py:374
msgid "The item was not removed because you didn't check that you were sure."
msgstr "ç±æ¼æ¨æ²æå¾é¸ç¢ºèªï¼è©²é
ç®æ²æ被移é¤ã"
-#: mediagoblin/user_pages/views.py:389
+#: mediagoblin/user_pages/views.py:382
msgid ""
"You are about to delete an item from another user's collection. Proceed with"
" caution."
msgstr "æ¨æ£å¨å¾å¥äººçèèä¸åªé¤é
ç®ï¼è«å°å¿æä½ã"
-#: mediagoblin/user_pages/views.py:422
+#: mediagoblin/user_pages/views.py:415
#, python-format
msgid "You deleted the collection \"%s\""
msgstr "æ¨å·²ç¶åªé¤ã%sãèèã"
-#: mediagoblin/user_pages/views.py:429
+#: mediagoblin/user_pages/views.py:422
msgid ""
"The collection was not deleted because you didn't check that you were sure."
msgstr "ç±æ¼æ¨æ²æå¾é¸ç¢ºèªï¼è©²èèæ²æ被移é¤ã"
-#: mediagoblin/user_pages/views.py:439
+#: mediagoblin/user_pages/views.py:430
msgid ""
"You are about to delete another user's collection. Proceed with caution."
msgstr "æ¨æ£å¨åªé¤å¥äººçèèï¼è«å°å¿æä½ã"