From 199685831d3f570104a8aa481198eb21fa687cc7 Mon Sep 17 00:00:00 2001
From: Elrond
Date: Sun, 26 May 2013 13:29:02 +0200
Subject: [PATCH 1/7] Extract footer into bits/base_footer.html.
---
mediagoblin/templates/mediagoblin/base.html | 11 +-------
.../mediagoblin/bits/base_footer.html | 28 +++++++++++++++++++
2 files changed, 29 insertions(+), 10 deletions(-)
create mode 100644 mediagoblin/templates/mediagoblin/bits/base_footer.html
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 5e2898f9..6c7c07d0 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -120,16 +120,7 @@
{% block mediagoblin_content %}
{% endblock mediagoblin_content %}
- {%- block mediagoblin_footer %}
-
- {% trans -%}
- Powered by MediaGoblin , a GNU project.
- {%- endtrans %}
- {% trans source_link=app_config['source_link'] -%}
- Released under the AGPL . Source code available.
- {%- endtrans %}
-
- {%- endblock mediagoblin_footer %}
+ {%- include "mediagoblin/bits/base_footer.html" %}
{%- endblock mediagoblin_body %}
{% include 'mediagoblin/bits/body_end.html' %}
diff --git a/mediagoblin/templates/mediagoblin/bits/base_footer.html b/mediagoblin/templates/mediagoblin/bits/base_footer.html
new file mode 100644
index 00000000..80cd41b0
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/bits/base_footer.html
@@ -0,0 +1,28 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011-2013 MediaGoblin contributors. See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#}
+
+{%- block mediagoblin_footer %}
+
+ {% trans -%}
+ Powered by MediaGoblin , a GNU project.
+ {%- endtrans %}
+ {% trans source_link=app_config['source_link'] -%}
+ Released under the AGPL . Source code available.
+ {%- endtrans %}
+
+{%- endblock mediagoblin_footer -%}
From cff285b1cbaf3e7a6aec6604fbeac410a5574480 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber
Date: Mon, 27 May 2013 13:55:06 -0500
Subject: [PATCH 2/7] Committing extracted and compiled translations
---
.../i18n/ar/LC_MESSAGES/mediagoblin.mo | Bin 24638 -> 28177 bytes
.../i18n/ar/LC_MESSAGES/mediagoblin.po | 720 ++++++++++--------
.../i18n/ca/LC_MESSAGES/mediagoblin.mo | Bin 24163 -> 25199 bytes
.../i18n/ca/LC_MESSAGES/mediagoblin.po | 417 ++++++----
.../i18n/da/LC_MESSAGES/mediagoblin.mo | Bin 23311 -> 24330 bytes
.../i18n/da/LC_MESSAGES/mediagoblin.po | 413 ++++++----
.../i18n/de/LC_MESSAGES/mediagoblin.mo | Bin 24819 -> 25761 bytes
.../i18n/de/LC_MESSAGES/mediagoblin.po | 443 ++++++-----
.../i18n/en/LC_MESSAGES/mediagoblin.po | 409 ++++++----
.../i18n/eo/LC_MESSAGES/mediagoblin.mo | Bin 24144 -> 25143 bytes
.../i18n/eo/LC_MESSAGES/mediagoblin.po | 421 +++++-----
.../i18n/es/LC_MESSAGES/mediagoblin.mo | Bin 24884 -> 25850 bytes
.../i18n/es/LC_MESSAGES/mediagoblin.po | 437 ++++++-----
.../i18n/fa/LC_MESSAGES/mediagoblin.mo | Bin 24126 -> 25146 bytes
.../i18n/fa/LC_MESSAGES/mediagoblin.po | 409 ++++++----
.../i18n/fr/LC_MESSAGES/mediagoblin.mo | Bin 25195 -> 26152 bytes
.../i18n/fr/LC_MESSAGES/mediagoblin.po | 429 ++++++-----
.../i18n/he/LC_MESSAGES/mediagoblin.mo | Bin 25897 -> 27337 bytes
.../i18n/he/LC_MESSAGES/mediagoblin.po | 476 +++++++-----
.../i18n/ia/LC_MESSAGES/mediagoblin.mo | Bin 23302 -> 24326 bytes
.../i18n/ia/LC_MESSAGES/mediagoblin.po | 411 ++++++----
.../i18n/is_IS/LC_MESSAGES/mediagoblin.mo | Bin 25008 -> 26226 bytes
.../i18n/is_IS/LC_MESSAGES/mediagoblin.po | 468 +++++++-----
.../i18n/it/LC_MESSAGES/mediagoblin.mo | Bin 24263 -> 25279 bytes
.../i18n/it/LC_MESSAGES/mediagoblin.po | 422 +++++-----
.../i18n/ja/LC_MESSAGES/mediagoblin.mo | Bin 23923 -> 24944 bytes
.../i18n/ja/LC_MESSAGES/mediagoblin.po | 411 ++++++----
.../i18n/ko_KR/LC_MESSAGES/mediagoblin.mo | Bin 25185 -> 26202 bytes
.../i18n/ko_KR/LC_MESSAGES/mediagoblin.po | 413 ++++++----
.../i18n/nl/LC_MESSAGES/mediagoblin.mo | Bin 23774 -> 24753 bytes
.../i18n/nl/LC_MESSAGES/mediagoblin.po | 415 ++++++----
.../i18n/nn_NO/LC_MESSAGES/mediagoblin.mo | Bin 22783 -> 23760 bytes
.../i18n/nn_NO/LC_MESSAGES/mediagoblin.po | 415 ++++++----
.../i18n/pl/LC_MESSAGES/mediagoblin.mo | Bin 24051 -> 25471 bytes
.../i18n/pl/LC_MESSAGES/mediagoblin.po | 504 +++++++-----
.../i18n/pt_BR/LC_MESSAGES/mediagoblin.mo | Bin 24133 -> 25166 bytes
.../i18n/pt_BR/LC_MESSAGES/mediagoblin.po | 436 ++++++-----
.../i18n/ro/LC_MESSAGES/mediagoblin.mo | Bin 24857 -> 25816 bytes
.../i18n/ro/LC_MESSAGES/mediagoblin.po | 415 ++++++----
.../i18n/ru/LC_MESSAGES/mediagoblin.mo | Bin 31085 -> 32008 bytes
.../i18n/ru/LC_MESSAGES/mediagoblin.po | 417 ++++++----
.../i18n/sk/LC_MESSAGES/mediagoblin.mo | Bin 24563 -> 25578 bytes
.../i18n/sk/LC_MESSAGES/mediagoblin.po | 427 ++++++-----
.../i18n/sl/LC_MESSAGES/mediagoblin.mo | Bin 23482 -> 24504 bytes
.../i18n/sl/LC_MESSAGES/mediagoblin.po | 409 ++++++----
.../i18n/sq/LC_MESSAGES/mediagoblin.mo | Bin 24623 -> 25789 bytes
.../i18n/sq/LC_MESSAGES/mediagoblin.po | 473 +++++++-----
.../i18n/sr/LC_MESSAGES/mediagoblin.mo | Bin 23398 -> 24362 bytes
.../i18n/sr/LC_MESSAGES/mediagoblin.po | 405 ++++++----
.../i18n/sv/LC_MESSAGES/mediagoblin.mo | Bin 23628 -> 24592 bytes
.../i18n/sv/LC_MESSAGES/mediagoblin.po | 409 ++++++----
.../i18n/te/LC_MESSAGES/mediagoblin.mo | Bin 23544 -> 24563 bytes
.../i18n/te/LC_MESSAGES/mediagoblin.po | 409 ++++++----
.../zh_TW.Big5/LC_MESSAGES/mediagoblin.mo | Bin 23342 -> 24306 bytes
.../zh_TW.Big5/LC_MESSAGES/mediagoblin.po | 405 ++++++----
.../i18n/zh_TW/LC_MESSAGES/mediagoblin.mo | Bin 22667 -> 23678 bytes
.../i18n/zh_TW/LC_MESSAGES/mediagoblin.po | 417 ++++++----
57 files changed, 7505 insertions(+), 5150 deletions(-)
diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo
index 5e69858efe4b7e9c3ff8baac1edc00ae1d88a6d6..543830c8c1b9be63d23cdf7d4d45a27fe32b9e0d 100644
GIT binary patch
literal 28177
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
delta 4846
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
TM>ToZIx;BI8${qN)D|eW6Xy
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/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 "يوجد ملف آخر بهذا المسار لدى هذى المستخدم."
@@ -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
+#: mediagoblin/edit/views.py:240
+msgid "Account settings saved"
+msgstr "تم حفظ خصائص حسابك"
+
+#: mediagoblin/edit/views.py:274
+msgid "You need to confirm the deletion of your account."
+msgstr "يجب عليك تأكيد إلغاء حسابك."
+
+#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138
+#: mediagoblin/user_pages/views.py:222
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr "أنت لديك مجموعة تدعى \"%s\"!"
+
+#: mediagoblin/edit/views.py:314
+msgid "A collection with that slug already exists for this user."
+msgstr "توجد مجموعة اخرى بهذا المسار لهذا المستخدم."
+
+#: 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:252
-msgid "Account settings saved"
+#: mediagoblin/edit/views.py:363
+msgid "Your password was changed successfully"
msgstr ""
-#: mediagoblin/edit/views.py:286
-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
-#, python-format
-msgid "You already have a collection called \"%s\"!"
-msgstr ""
-
-#: mediagoblin/edit/views.py:326
-msgid "A collection with that slug already exists for this user."
-msgstr ""
-
-#: mediagoblin/edit/views.py:343
-msgid "You are editing another user's collection. Proceed with caution."
-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 "لا يوجد مسار جيد لهذا الثيم\n"
+
+#: 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/theme.py:74
-msgid "However, old link directory symlink found; removed.\n"
+#: 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
-msgid "Log out"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/base.html:96
+msgid "Log out"
+msgstr "تسجيل خروج"
+
+#: 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 ""
+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 "أحدث الوسائط"
#: 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 ""
+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
"
+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 "+"
-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 495ef726102341a18eeaa2cf1f90027a45e34394..ec01d7f704a98297d3498376e438ec88c01beed6 100644
GIT binary patch
delta 5215
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
W!|1uXjDl~~-*=Z^Fq*!4>E8im9!i}6
delta 4329
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
DS+!L?
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 6b6827f035faed0e2352b32997ca28964ad2f7c7..53e3fedf393de44133cddd6144eebdd0e87ded4d 100644
GIT binary patch
delta 5147
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
gQMoMeVr8w, 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 5ae794fab6653d2942ecaa68dddbe807d6c1bee2..a07400aefed55e4f45688d84c34f4b0d3e8214ca 100644
GIT binary patch
delta 5264
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
S)JxdWUuWzONZ1F~RsRP^dtCzn
delta 4427
zcmaLZdvuLg8prXS3n38%kpz)fh+BjtB#203Bt+aVt-JQbc_oMB9COZzDML@0VhuxP
zIW<$GI<%&yI;fu3!kD!f^rAYgVRX5SWp#{>YIV^p{$M)u{pCGt&3|*&Nj`hO@4NSY
z_OthXlRY2De19q?bfZ)JcEjfzetPh;IzhGneXh4RCX?#lF$*7KK6dY5%u_fCyWuae
z3+}_NcmmttMU27g*bZ;tKkzOV8WS>~bu^}k3$ZE248ajN59_cWp2m&za2H2X4|H}0
zIDm1~&mdixk1!dppaS^{iPb#8wwT04J(r4HGJUZ<7|Q0e*`~_!cU#_puWm!yR}YTjLValZ_3S#`xx!6#C=uQ7O8BiFgC~
znmhbzS(P+ndQxwLtFRv`@YhitpGOUN5gE(eMg{mJdOtbc7?NnZpq}fCp?C@-DJb$X
z)Bx4U*Le7)wOtpzz6-UcCs3(9i)w!f75Ej@9=eT;Y2q@R{<@=UF4rn@|J2i)w!s707jD
z70e@4$~#(4yPl}cnv2S0sEC4QI0}{Gxu}SJsD{r+>l;uhZ$hozPTYWJQ0*r6at3ta
zkEpLgW%f^~i9AFFoBCDA17jJ
zUt=oKh2wA^YS-UGFDCVKcK<3=;M;H}zKv7xKd3;a5ZxZeH$SB?7&AG{7EVHS*noV^
zrl{{BF_;@T3*!eG^CHegy*aPqbC}3hFT`co3SYxTxEHmgaf}{^DcExUQz^9JLN`>(
zd!sg05o!iiXrT)=&^lDd@1g=dihAyEn1J_C?H^)$Y@6rov2@h)#Yn7XW*+%}n!*cQ
zsKQG)7Bfl5aCBig?!Zxa6<1?dqF9e%WKt$0-&vwc98cYY+wd^jSW)2Yt^KHsoU12$Sn4mMI{r1b#e=Af97Sd9
zWYiC$_s@qYjONB=ydJ}`;Pu4*F!zg`NHdC^K*nM@*Bem-9KkO5Y1A(F4Oh@gBO*j>AqBcuDY3hvgQK|Kz
z+O5PyT!-nn1>eFqQO`{)bCz}<>fCR~{`d~2==@)yptZS+nRp-7u)|Z%z!~@k^$H|-
z^Dop)`jk6sUx0ccO~;;CiwbN5D&QtmX5K&rdIZ(}6zcDf`3r?Kyo*}XxG~PAOGkB7
zfx12!)jf1CfVLpF%t=&+;>Yn{7IwowqI(?qR|gh{
zR-5V=YDO1PYxw{*gQO~Bcr}=A$g-L$)C@OZYdnC;$a|;>e1L86uTig|`n`n;B#tPw
zBpDOPe{TwdxS-=Q4U^G@@#sSZ5Ja7hpJ6Y2AG_lhsP^BZ0#2)T0?0?TD~;ACVgmKq
zsP@ldS6mySph#aq4ZJ5>KZKgeQRH1?&fq3|gxaL*COYqj-MEzcIVAh0Xp)o3Rj3)h
zjGJ*Ew#A_=yfQHw`(bDS1*POARD<831~`Bn@DtQtxQ5Eecc_k$w@uZeNP4
zsINyoufMUHSx=-(Ga6}Pw&G~Ki3fFmma}(0#eq8i%@lMjvYvJ}St%A!Uy1|qRaE33
z;`5mBj5E_0kr|j{ScciNom1q(0QFkb#I9i+-ii7xwxfO@Eyg!LP|$A9n&WJaaj1G7
z7Ge|Xc>WnR(~nT6Xn7Pj8ZHp;XyWt=lggLs6LokF3@er~KCV3v$*cWCYg>kqa
zwTbRW>&4`MBlR`77F#WFX1)>gsGme)F!#`pPnUf~INeBQhY0x7Wy^9y*0?{KSNXh}hFZa$yH
zNv=RJZlIjwAu*KV+EPp$2>y|nhPpw(w3+2N*=Ys&UBw*T~z
zB};5?u%3~EmaF0aEJE$54snsyWue$`%9sJ+`D4l>pO0yXiByjLRon2|Ug-(Tf_0~l
z)Y;*z$&Ha+lP|@FS4>+TX+8aHOytgt$~KYm`P&oP&Gj|, 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)s s 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)s s 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,34 +17,39 @@ 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."
-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 ""
@@ -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 ac74a68b5930ef0d8de43bf026165fe424c90025..406b269f2e25e8fc075ccd2fbb19ebbf7c26a824 100644
GIT binary patch
delta 5311
zcma*pdvH|c8OQNAA+Qh-0wEz>b4U!A1d;#=grHmufpC*lE}&QE-{EK
z9R#$FT3H!IEm|X0!9TR=v{)ILisEQ%v7%$W0HdWk(>iLs-?07ua*nokoY73OpZ7g`
z&hx(S^FHrxo6YldwPIn_3#_m{`LECKK+Mr
z0)B?qV9^Nj|1ynErqhU5Q|cvn29?rGW|fb#unO1XcDx-sa0qW|Vz;19$zfD+J%d{L
zX)MHdumH0xFH=)c3%E2%Ln&T~N?91S1u@hO9jNzziVA!yYVRLFVwz*9Ej)|bviDIL
zNgwT{I)EB@Fe=V8)bk6Gq?%-qhW2n9D&_l7Gwwv~)zhe|ei4<@GpLoGL!~;M=$d#Q
z>iN-rzs$D^wKa24Te$>x;}+!kq&ZJR6Ub)NOK<`z)edT951=OUDBg@GP#Iczp_lq~
zs7$n@R(>1m{<}~ac@P!5J%4%E!^$9U(x
z4pl_kv3t)^seA?};W=!;+_4-nyb_gxmoNk0K-OU1!bOa4GKpS`D{&s)g*qO8!zk(y
z>y$XCmF&S~cn@BRAE72xQ_N=wwqYp_qLM9~gNoOP+-j1(4`PzVnNu{D;=uTANCs3(=1^eJ>RLb8*W#}F3g&(0Z
z`K52#RIeXE#k&CYT(ZJ%Oh*Nri5FuXzL3UQMWu9g6(5&)Es}k62xs9dn2STFdn+vW
zU4SauMpP|qMZ%e#*bjH%S)KpAG?bDUc_M4(KHtA$h<-ozN8kTf;%xe#U*u(~nptY4
zt1uha;{bFq2X~?}yWhY55a!W8iUaW_%+dLOn}$|)9+k4fnce{7QT_R-2`)i>KqYZ8
zK7q4w0BO*Q>QRB$VPAAmTXi+6Sd+LPZ$eFc+-x$Kq)|p=FgmE2UyB@la|c>@95ui>
z)E@r}hvMgcKYNb%Wi=dCto67R<9`1=)Lv&Zd&S8^WvmF3O3`#03cMIKv*rE`YfvA-
z4l2M7RE_LH?d{Dt4Da{*PoS#$RaCrQHQpBVNA*Xe;*H1ASY1Q@^J%Q*f{xEN9E-m~
zrR>kB^LiQ!FlVkY{F*9WwAa_50^f-GAliqD*NK|wasT>rxSalLsNyZJRpn7LwY+{x
z<181V`0_mOpUiplz5nrc;3%&D5jmOWAGj0q`BZVS6ZOF}WPz873RDdQ+9TTN%bF
zxED3S6W9meO485+?_&n0FZ7N}z&8t36GKsZR)z{tgUUz~>iF$ORrfDYaej+R^<&7V
zv-uN_#4k{_lefsrbaFBcJ=lP%1s4l(H)_B`s6dZn4?KyQz$w(kK18jg4@W}xXJc<1
z>syX}=}$+cz7}uAI9l3;K1;mR72{gnfK_-es>oi$e)u8YiTcV@k=})RzZ11ZkD*rn
zDrzBTQJMX~e?McXw~#_q(Nl*hOH@jW
zf8q^ThZMe9gY9?#H)8H(UIvn=%-n#=@U2+S_~wWj*oRSN0}jW-7{#Zt45w1UDz;{1
zPG%=EhB<|kv1o<&{l5y!>3@NmXvs=1Lk(C$zXQkPK}?RNagqkxVLrt>aPH;afM;<7
z{Q;}I0oqWh@5D`b2rs~#)n2t1qPCy}RTJen5UWuWUyMZ;`Nj2}GwrtuO&p1}le*`P>tu^F-8jTTa
z`R4mVbbqrTxCN`i_Zlj886Dm_KDwA9N>pM`#
z@Oo6deW>S#9rYW3K<(uTY{VCXsaN~|Ca2knwFcvHJG4F?Znej|RiOJDiX-9ZW~-pcEvUANT+6;H?8X@=8nVK!6?NiP&~iIkbyH?nU`VgD
zKuydJGNrD5dAYswyB}_L65P&YyTi<|Vs@*uB^+%j%}kB7Hl@#<*R{h6r>D*pG>+OF
zZfoNm|Hfd1SfLKfwc}Qztu(W1ZsBcdIZaM$s~y!OVzw0uyTQf?!@Y3fxLVVZ5OhMSzI
z*+?uCaat@V5jU;jXd-T#Rwo+YXrgwz9WzcO#A_nzaPt=ybmJ43$AVEe5{x^sYOAT;Zfvw;)@rOvlZb@6
ztMSKIYiixh^WPTh>RD6z6fPyk4;AbUb;-codEFb?)qBC=^o(V}Eq3bHi?-%3`+?dm
zS=^O2Vwn?*bx;xCTf(m|`6w`Og}+FPu68_
delta 4406
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
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 e2df07310aeec5e44a90eb9a22b31f0676bbcd83..ececfb2eb6c9f6c4b1946316e0719edf3ef91fd9 100644
GIT binary patch
delta 5195
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
Nez?p+@wZmj{s-hqQ&s=~
delta 4336
zcmaLZdr*|u8OQMhq96(a%2k0^40uH@0ue-miVAoac<~baPDfl{e!=0Fb
zM=%14PUVjO;eTk#Zjz=fnI1D9eV^P8X1=!3gZDLRLdcoq3J|KQit
zsw5hdMn3{qU~g35J5U3kLQQxcnaf;91^764KPt%>l4!c2p36di7>!~YihLMqf-22f-2Dh)Pn1i$vcXXunN1f)nCF*$egA#>Co=aLT#FI)XHaIFRVk=avd_K*^64hNmPo@p)&RjszkSg
z_wNVqKlanmz+DJOweE$Atb|{x-7Hki7Nat<5|!!})WjQ66YWR6e*zUqD^dm1hDv#i
z<-C`M+N}Line-RZ&1t^6)(C1K=S*Hcjw_CsZ)Ea)hlPQMC&
zi91k%Ry^Yz*JU_>{!UbeE?}O{|MxUzaiM3XF*VqXTIrVMHpD{1vOw=dmWqbi6+3NYY7~A7JI1k@Lm9!nRx5HR`dj8{SL~tPmmGWMwO;w0m
zK?PdqLQT|y8hAe{&_k%_{(|B79qRpu7>ymXojsO>dcFvW)l_Gb|L19};z9*pz>%0r
zI-W%rmf=<$f|s!w6Nq9p+Q_0za;{UNQ8EjKLQ4D}`rhD6%h5yZlR3Chnmo
z?82GUN)m7(_C~U6HefTJ!mqKioWF>eJ<9o<*n+d@pTI1%MmzsAj=^{6uN_VPZ5mmG
zmxhN?5nno)L
zKZ|`abds}Y24D^SAK`qR|I;+I;(?Q$+La)GkxeZ=p{)TJ^Q^48ulTGsq4b|*C>RiXo
zcK)-OgzMVH|LT6
zG#aDH;{bFA-Go}vN2p`=Ij+J7XkpU}&Y#;Ym_+|gjKqDYlphK9KMi^@c>OEXDfuUw
zjLgOi%MOkCm0cZ^Xt&1f4!0~{L!@N|UXAsJWG)&sYU!CP!-ekP)AG;fjZ%M7&E-gBe
zHz+%|z{(q3l3S3STa=p{IcZ|{6!(jsMvu>%T}~h+R(`G?;=9nw%`M3d^nLbvh@Dlu
ztDm*p>#}N=yS+^=%k8z?jZJQ=(bMGdmFBqqyC4?L((G4bC-$lIHa5AIxUBK+T92#F
zw_u5fcf3~9a;v_{-fu}(&C&C(6jptavYbwd0&r&i?jk}@2)j+U~x?|6;O|*B`
GR{sZuSzez2
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
-msgid "Log out"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/base.html:96
+msgid "Log out"
+msgstr "Cerrar sesión"
+
+#: 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 4b319ebdbe47cbd07f0c74fe65fdeccf09616a5c..3422ad979e1993332f2f17acc88b7fba2178ed71 100644
GIT binary patch
delta 5125
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
I|2pY^0hv}nWdHyG
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 ada992ce28d1e89631f04800869a27ffc2063092..7bc860a0fd5b08527090f0b09bf279bdfbdfee9f 100644
GIT binary patch
delta 5143
zcmb8y3vg7`9mnyL7YX5&H}B*U2;of
zjf?PQT#Wgwq5?grf$u?0v>ylHqo@TQLDp`b!yR}M`(f8mV+xtybkpG5{DL2hZ4TlD
zJcbsYLxpVkFv5uAkugjurs5(j#|F&D&3FyohuT=daA(4cQ4486&C`SttvpOa1N{WG
zvaLu~%nsB84`4Drf!f(qsELjtbC~y0xliSXt{0+mJ`a_G#i-|3qc*Y*RcjkZ5Pvpj
zZsdX<+=az>2$jpXQIYrrnZx9dbW%};TCg8Aa2IM}*P?cIBPx}5$FJXq3+eC2DR>UA
z!=h2d{}medvYbZTM5#~4Q>c)pv#J8D!75yj-MAgYIFw&%VYi`9$pfh3dKR_wlQ#bqif;AP|uHv
z_ov6LLZxONDwWHy2Ro7HBjyVlT0l0lUW8Lnq4uM8wg_v_LSp51+sD;0d$vXf4q@e-M_g$bei;Vdp{V}*3!>E-PjCaoaB2*D|
zV_(iup?nrg@eHoPykd?RUWJOl%b1L>BYQA!;S%OI>5RSrS79CAg*qN@pbvG3bxQoG
zoovAsxC@u#$EXF(pTs)^+i@CZQOOq0Lygyn+-f3m_hN+2nd3Ar#n141T+V2E1s}r=
z_!XAnhN(^sL~$Mc9jKh2!zAp-tlD8Zrr{7&3WmjsEyQ5BmNeRRxW75n=l0r
zqE>t;e&cJHO8*no0AJu>%-|uVpa6CMg~;a38eEB+aS{F%=i|5%P5`#zT-;Sc{Aba4
zoeS6EXcD*???i%OEViv&Eyab{j$82&v~kG{r*;mYLi+;hczuqPfyv?}QjIfFJMKW$
z$j?yYABxb(qVX
zPCpej-XPR-k@9$BCThSrcp)yr=My-qsFkj)a$e0hAi*+wu?AnoJRC98IR&Mt{?fQj
zs9LxN8P5C&vvD(?*7@H-gJ_yCabmG%AFBU%T!XpfN1y-g$gSqwY$umxtWrDfL`~Qo
zcN-Sa--pBTC~CsD;=lh_yq`HoeYkNK&9#{REm@4I-mb}sDUx)+f*JA-*j#|hjRK)JUvG^eBz3>9+n4U(B`#x&EPjMXfuO%DAx(>DQUerQ%#rp?v
zApJ*i06vXM?Q!hE#N~abDq?P;F^LODkUBIUBIz;Z^-eW!LPe+-x8wb&oX>A?{<2wu
zstq3|)jNsa3)%fCG@+n8uy?F-@qnZcBvDA1E>Z54i&*CaV7Jcw`p*%xp1Z9ZKxu76Pq!S
z(w%}H)cL*xUHA}QfjRuOQiE6F@9_X?A%V-BKU^NfLi&F})xu|}@y4zu|3x$!XtZJ{
zZo$(y16$TO$89H;(Lax>f$5h!|G}uhLG<^ditY*24xhwKd^+w496|qGw6GtmR*e;3
zLHxCVC0r=St56gC5|xsDI1-PdQu7Y#Rr?|4V1M4j%5^>#<7}LcZfwWfaRa8Tb0XG^
ziu5zM07tDS{%qDXuIG;rd>l7p-3F%!kD_v$O}xp5sl|KnPVBbVG
zUJ;v&)U#QK7CwmD=<}#?lOk@Xy30{HT8KS(B^Ka^sOrtMomXrXCeg1)g?imH1Vga#%!}8J!`W|lfhq#@k^$j!23fOJ_PLHo;T6%P}b!B30UF>?xlNdcy
z*qFc3)85W+;y1dyjO7knLA%2WwNFcr)sF2=$Zhhswb?!`B4Ar?PteuqWx5x~txZi?
z(B|@ZV}(-!sgc$GP{8_nBUYCyXf?IEd@Z)y3Wl1R>|n4td8Go?D
zxLsj#!&Og{-)CC6ZoK{$%OC16Z605!!!~VxUq`F)*Eo^SSeZPR7j8%@}DMW37TcxlDdvJ0%z8Pyf#Q%fpJO41wZr(R-r
zdV(ImZ)z=ZthUNZN@wu9zWb`GD`LMbKb!Dh@_e}R=IDfs;;(ZZ-JKDQwpQIjx(_GB
zUaKxkNSW7{^g*+Kofv(oE+hJzIaLLUjKW?tAr!O&K9@?TIQXCNQ3sQvxiwkk^Zg;O
zyD#hiM^%ik8U0OFTr~HS{$uMInd|-R?zw08
z*=Kjp@nA>5?K1)1Ytg~m4S#p|*PnlDLsa|U-<6)mBvQSKN%$Du*e}wUu{aI;;ueg-
z1K0;oVkmxz0eA(&@fzO1+n8mH*PM?sCWnT=UdCkNC|rP*I0)Nu6FuCKbftOH$+(KeCUDzGNXw>gwktUOdJsIB=P)MiYS^tFw>_&YP=HlyEf@g3F
zM#MS+&qsCm3)BF+FbvyJfqjV4_z~{J4txrik)9N+!8pb@+b9gigQygJfj#gV@-g4?
z^<-7zj2S>Z6q|7nD)2q1jyq5Teu<1_zCi`p<-Z;gZwyH^F{t0Ap*NU9J_SWS1~tGG
zq
z<)RNY)9+9nKR^Zc2sNW1qS4YMpxTpgG7iOI*nsPBH-3!+`Y{+j#GzP9bR%&iYBQhc
zPyRn
z(LemxJN?(YycE=NB;jbS2cjY?;7e<_0JUZ-P#IZ=O7#ZRz*|uRy^p&8EGm#I$SRme
zsFX*!ocji#HtSGSCcQZnG{e!T6qlkR_MmQD0dDz?;w4d`#2S2(~K#`
zGMt15P`myv)?(NoXZJUw0&m4RcnD|UPpCj<5Z$|sZ(gA=91}UrE}Vwyum<^i&n=6T4?Pdn_LH`&=YeGbe-m|BS+V8cOg2
zPQ*mgk%whC4tL^cyo_tH4^eDH8<~_za63y>jFYKXVJjX*3yVfLd+XPzjGjZCmd+96
zpJg*)!
z{ntCZ6rSP2Mf_6$$AZU`2E38uJTfD5o!4z1j-|a4wR;a@A8hw~8MTD>k#5Ytus3$$
zU5p}~#B6>-x;9y(oVvG?f_DEqs9pXL^}6kw@4RmJkQOb;71T^ztV16h>~}0CQJ;r8
z#;Z^RZ}VT@=dXW^F|?mYEx}Fay4Un9bW)Xyd`u=^FJd(=!Vc6i8$z1ma3w0Wn=uk?
z)NbC3TA~BE6HlN5o;${Qx4eMK)NOzLLk!pXzeAx17k)scHkdr?#w6^AgYXTUhy(C1
z_!K@u4ft<=d#`a$-Hp0`BKE?msLU)vwXeo7^kR~i!fO;X@F7%cKSeFYRgA!Z@y;=d
zM0GF#HE@xY7go{y|c|CGa%zo^N7m&G`8<>nK6P)Kn5qh<0_ES*DM^KR+Lv?f-
zwQIjc4R{adVIUiVePv4VUEGF`F{_9Tio=VY=fnbJA
z#i;QrP=RdrQV6B67d6xOP?4WPEyX$1T3*B!>^9XoC0lR^_0N%2F`Y;fP2MzT)2>Hl
zY%IpBxC2=o
z(=^k0JD$R9>Or&o4>05rVk)r;_u^8A23rGOWiJ@B)s-5p#L`;!0E?S#&;F=f8$R3Jq^!I(~%e@CK%06kEO$
zb8!>y!fYJ$ymO2eVixt2s5QQa&G%0#>U2C8wfPpHX4;HeiZ?M1ccC`jZ%|9xfrIcn2-SF?IJ+$OSCsUhH0ey_h)FouQ
znD8a!-$h~J5@)7s(M|m*M&otV(tM9C7*DiGxC;aEci0C{qf&hd!|@hIVyC}7xZF9`
z(O5)#8k&^Uh7^|_812TXE6$tK$dT6XN6Tt?`e2
ztqHNA_8*fiUw%q?puPL)MZUz;?E$_&r_BxVFS8h{YN@BzRC``>
zd72tct+m>!H=gPW%P!14IU+m5J<>H|RDpYBhCA2o?lEg-#&g!Hs)j00ZAK9R6}Yn8
z`VpTTm)l+7_NC|jGl1#sb+@-!&90_e*HTYSU8Ch{XsUNDg{nrYFthBxGt=xmO;4uT
zS}=2XQF~imwdZASoNiTAl}+}PS69_OxpkGNvEFjk)qCoo!Kz, 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 ce2963f7bfadb0b939456e334a6b9f291235bdd0..e2c22c79ff430543b57690d178d3c67d89f72250 100644
GIT binary patch
delta 6868
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
Rrk^@r{!1rf|AT+)e*+NuH)H?+
delta 4782
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
PA|tx{q8{40=&An#XM{sb
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
-msgid "Log out"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/base.html:96
+msgid "Log out"
+msgstr "התנתקות"
+
+#: 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 d9addaa60b99eb33131fbb51b28fa0ac40b62bba..d22f6ee62ee08e646cde4817937d168aaf8876c7 100644
GIT binary patch
delta 5140
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
delta 4273
zcmb`|dr*|u8OQO%MY+jUP(jgE1VOnhDvJ=rHG%?CjiU7ut3g?niGmSo5{ho>L^8%$
zQ#Q6`npB!dXh=<4w@qk5($uK64W@OZrdmonO+sp=Ix$ut)cf~ef0QxFbpL>p@D@68e6%t1uo9E-
zDU8QX9D_X=isvx^`*9Qw;0JgGXBy)*zm72`j{||R#^m4}T#H+A8oq;1Fv1lqpx-ds
zn&21)(Lad{Va{MAUPJ}*F%qk}jbRwUL0y-C95QJb#r&p_Mg|AU?Gp_+g8mce!h=|b
zC$Rz}6Rdz&qXzsMYJwvefiIx~`w7P3Pq7VqaU^agJyUQyj%9xHG>vrp9x6rWFdPSv
zkGag(-KvZ=W+MGiY{F@%z@JAA+>4sQP-uRH<(5N4Mkpz
znxF#tm|DJ6+r9Sj=TJ56L8bN->i#}d;1^MQXb_px1SMMIjYpNT5LKd$s0HsxB>%Kc
z8(%K;qgMJ?)WFwKfeoWp6ht&CO(N>}BwU0uFcTYaH@4&ZIB`6a;Z2-@Ylv<(?n7Co;^Lv5N8)XG<53T{Ew@&GcYc?GqAU!qcc4wbPF
zQ6>7Deg1}h{`V}|0z@;{YVwe
zFe>FS4(q;&sLeV9l}T?N4XyAVREpQ2BCbc>_=w$aL8bfqD4HzY~?AKFrnge~rdk4oprpW)n7}R{AFl#vx=Z^9e4-gfwGH
zu^Ja*Cu-MU#X5|bX6^naRN$>xg)ie0{2Ud?5~BMq^P8{G$i`$IW(QWH2HcK(%#*f1
zMq)4nxB`Qx8}k^hLA^OI;R6`XR-cIv;t2c>uE(ROk_It*5XR!&=Rbi)CSEZZ!rX~qVB(mQ5cqG?XhvF>s?5!rYej4ucWbu17+BU
z3ow~<&Ka6_SK7}gbQDhi%3`gM)
z@B{2YVm9rhm7&aeR4Kh-bFAH8fNV_j4C?2$2Mg$zkd`sH2eoMqV+^)oBzBBcBL
zi&}X<>bgN3jl=f&2sE9L)tN}NmCfI=y*n|qK
z1y!Oau??R?U6)UKd4-tys7%#hIyU1dJ^vjv!Z~mpwbD0HHS0s(&ZZxm@D?iaUB%YB
zyd9(IcVYs*hFbAi`}_dL(*Fn**f8pS5>6czcr;FAelwoNI4r~@tkMarL)G*kDz)E0
z4bXwAZ5K|!*HA0#L)|xoDrJP*ns^p!#S2ky+Im!`_oG)UeVc{`K7)$vENVp;QKh+t
zI{tTDgaPxdH&{9DroRi{#~Zj2d+)WLnjD^G_OrPkC*jk`wlY7&J$QKm`G1tg))FhS
zKVvfe+o(;GRBEj}8&l}dMb)wzm8r*33pj#GaVIKcucJ!yj(z^Teg5~Taj&9E9k|eI
zMV82mT(v7e)vN-Qk#(q4SEDAbLrwH`)Bs0OfxLk#;RV!FaSe6f9n>ZaCv77z9<{(E
zREFnxX(-|)s2f+IQth#Q2vxh?*n%&jZpO6rD
z(7%o|v1+-UVq8!EAV%U42H`(Y8T=>4U=UHpGQWwZ5r=80)EA%wmtzh#pf=A7s6byr
zU3VHo@sFtc|AJ9?3$@9@iCWjE<8&;=mAC`h4(2p^7to02Xg*e<8xJ6FUDJ!r82Ux)
z=XM{?pdUfuRib=kKbrfo6<j48>seGrdr(iyAg19REX1j6$p1JR8`fBx;}O&Z
zU8ogZK&|95Dy1Rp9PQf87>F&Xf%jt=wqpo(p)z*dw%b1c7S84P88lN;8>TpXfid6r
zr4(fQK8^83Ivn*o!yWdY@2dr4{V&EY3rO8Mt9X7*ji<&@Ussev$G)U!M{#O;O?9Iu
zqoF8ghyO<0fk6Mhgn~fd2KQ)RxjW9+>~{M;ai8+7NObvI6B9yx?@spk3#M!g^tDg@
zl0P~1aDe|eX)8kfu53?8V0EMK=Xv8MZ1ylu?WX!Vv#oxMqyEc{rq1)QXQ!#(R^#y%
zxq5PEWjSX%a_1B}XJ, 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 376aace496dfe0c14ea9893225c832736506b508..2fb3a8ce8a51aee4368ec6c0339e90f3a9cdcaed 100644
GIT binary patch
delta 6622
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
CH1PQV
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
-msgid "Log out"
-msgstr ""
-
#: mediagoblin/templates/mediagoblin/base.html:96
+msgid "Log out"
+msgstr "Skrá út"
+
+#: 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 62451511186c1535115755ebca74f0ae3749e7c4..62575b62824640850203412533f503ec7a80ca0e 100644
GIT binary patch
delta 5234
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
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 1344c9bdf545fe0c3596f79d1127766f03c45f1f..3c82d1ff45089e708fe94b0fdaef27525257353a 100644
GIT binary patch
delta 5189
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
delta 4269
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
C4>|Jy
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 69bf72bc8122ed635d411ae889c0637ac4a4df0c..7d37ab7c9c3ac463f56729f1eb8f1d0e56dbe00e 100644
GIT binary patch
delta 5269
zcmb8x3vg7`9mnyLkdP30L>}QyZUO{?kOvS9L;^89Vj?6JML_{K$qg*o?2Wsd#3*ES
zBtTmg>IxD;i&aMO1vN5)FQ(Ok(psuwTeV`L47N3`t(6u>vHkvXueI%Tv}Hm*=bSzF
zJpSi@?&jo6ac}=5E_$MW!WP57&-p)s|Gkq{`|{ss{frq&^*pBI@Kj^+un1>i0Mqa>
z9ELCAKs@2K{{=N<%7wVr+8|
z$Kx@y@Ej^+Lx&JX%tFR6`Iv-dI2EgK6t?3{_z-Gi=|kNKFGDS)3N=p+Mz!)*3L5BJ
zsFmG?oQml{J@6!$YXEd><8wv&bA~)NuDG3Q-GoPy@H17PbbpvyG^uyx(ho2VJi;iLoMt(s9W+VD!E=k?fhLF
zja`_Dsg@h5DX0xBj8agD7o$SvM;$>3)u9#j`K_pd??#>dZe&bz2z7+-p^ofNsEEX8
zxS>u$O*{}a&c&$b%aNd(sE>lqa1AQtTTm;05Or2ZP+5H(719%^ot{R8I-b$B@FA$@
zGrW4PXCdlnN>E3+0M}zP@_f{sr=SH4VAe}0p!)AXMPv_Z{Aa!PM@I3~xY1;7v@xlgJ*-8LVJ_lfvk8aWT%r9jNQ^8w{c@v2KZj
z+Q|l7ggbE|evDdB=>*;(*oZmUpG>x}1T|hY($z#g_h6LGnKvk0iJ#ytxRBBG3O64XX2bBMo1VHFLU@SB*3
z2T?0Nyi<2jN4g36ji2KtSvroR
zUXB_dgyk4T3yc6JI`w28aS{r;be_fvlfhhhy6jl{L6quY*3#v?cy-$WhRCum`2
zg&XnGCENki{0P^94VcA-|<`y1}NeF*NN-iBJxm@C|`-PK6`nHNxJ
z-eZybV#+{;`dYjVw_*(ryV8wJ8){*E|U!3j8R
zv75ac9mV1JJ5&-TE^{N3ifPm*p$4AgwO3;v^(e9jvk%E@ld|0XlkRFH
zSY|Kk2z#y|{_0q?bA
zmtYaT4>qs_jL&>Qme2BZbpUpZcM;ksO$L%
z>WH4iL_Fx#4|yKOEZSd1JvZ!QukZ;f#Ghjo_Nt4$-S??Mbxx?k7m3)lDDZ=@jChfj8)reh3$yd)R>dfIcM}eaf51{h6X#RMTBgt
z)*tp&2bk{lG0Tz?=QjBKfzHf{p`_@Nf8CnZ;tN|ft9-$gcC8g|s;RNV;ku?kpw)PT
z(d-1ha5&+Jsr9v*I-6F1jT1Dh7|R5lm6p>KF%AA;Q^Yn6PB5~{1nm|(WSl@Pzng*%
zotv#X*5J=%6A{M>H3cU!v0YPd>G?W;z&0(mU2j@#U+n0V=kg0CO}^O5pE9Fh>ZH7a
zyu6gE%1Kw)&Hk|82~L_r9A{XQ^YW+gS$Ds}83nPYr;Fi-Xz_wCQ}4&Kic>~cGRW7ZUvhbK
za@Cx9-RIJ|w)~0sghjq)J2qj#ZRv}?CKVrBa4v4dA}17T<$(WNM#h#^4)1)v@<8&1
zS9#mDxB+g4My@IDmG!@6Xl%bPJF0a2!`;t)5ZhsOZCTfK-&0-BZ~Ka@?ApKM_fJ1(
h)Nkjyf6vRWPs@-wwSKeZ4RPwet=1*JSXy<(KLCL3YJmU%
delta 4362
zcmaLYdvuLg8prW{l4x!&5fX6;Z$jMCa1s(E5s3y7_gh^mh~^+Ji4l5Hb&LjUFiplQ
zMF&;GQgJCxwP9kd8cfZw){Mb)F(%6lt&SYDU4}m}=KJ%WnfY(BPR?iV{l4$s&wlpa
z=e>T>^|!MwZ$orQjp5JFe+T|ogsS$xzZ=bsiKqHk?1WFyjqO_)GYCgwJKTt^aUaHF
zJ%-_Bbm0wbiVb)R8!^ooulYliG3hh}wKS$T_Qz>B54+(RTt^R$IDmRZD`$X17)<>v
z(uFyX&F~s3kUL1M<|&3_B#pW+25B-~u{q(X>Y0*A=}X6b4XGyrY)+y6Ar^Je7UEGCVW5@OkhL12ArxIOXT!Y%oCp(b;
z{uHj$uo7Fb)!)WV$e5-n>Co=)irO^!sF_c}&NvsfmK%^U&0*98euql&B~-?4qn7Ai
z;QGVB^`~A6>bM2rXstV=BFp4UYc~zGW(!amc^8%H)u@51Py-!9J%0`r$PHu_%wtr_
zqb%pSj;PI=jLM`poq}eVg-Y>MRK(?|2j2?R*P>Ehg<88`;#xe5dTvC5Ghi_eroJ4N
z*;A;AJVFH?O4L=@8p(*)?4h7kA3%aN=TJ9(gPQq|sF{S2Z?(sx2JDH-NN&I(IGK7O
z?#11xKnuD!$Mq-pGWC6^3|+xgo&N_ErqPg)WX$Wh0yWc{7=nJJFY^PAz?iPa48dX?
ziu+Kz{yvsrWH)E`FGmHw2`AtI9F5OWfs7`)j~U;*L!lSObC@k0iRy3>@-gcJeul(g
z8gL?p^fYD_PDTB4UdLG&!B$Vh1=s|4;tbq_TGC)f55|`G;{3-@2&17LD&?I~n<^bO
zg95a$7&XvpRL93qf!3k!yNaQBANBkrY>we6&K`?H-JgNPY9^$R|49^9(old`@D+?F
z9sRHvb8#DH;dNYru|%;3ZDdlWt=n0mAvlbBDQ?1}=)wF{XK&S_GWvVeX?d7R{#iB?
zNxm{M4Km*pFdPq~GE#@i*p~r+8@PVa
zOJN`v{*0Sl91DJ)l$!nNPO7gUlQ1C}&g(WEwR@MLPE9o`pjy-to=3Vdm#`^b#yfZu
ziP@Ydt#oOgpneIxsr{YZKL=SZa~k!!y^jN^zd>5qpXLa@gx4?%Z(=k20bAqqK)p5V
zr0a>O>wT~l=3y*OLM_2Ur`>BlprDRxaTFfK>G&K8+Dy;p#e_Dh<3C{}-ay7gj&)_I&G@+-;Y8B4f&{!OfU}wSnswu_g7(sF{BgXnz_oIG3gLav_33drU%gn1@Wl%tEc<4s4FKs2QC=
z&E!k$gjcZx{u8x#qVt^B?LgG?9xTKqXyGXwf(__Zhg}9c9Veqwn}!zVpmyy{)PNow
zhRZPte}lX6JB)Sl7Ub-1puU@YYrtNN@*2L4n%Gs;@qUOavHwu=zmvijL!I6HD!s>3
zUyNF#_febZBzDI0s3r2Fg)s%rQe~jlJ_j|Saj4@rC2)N27gsR{s&R`
zH4WB
zOz=`r#HFYQ7o*l}C2A=)pfa%q*WwxMj)fzfKr4{!o2^Jz&0kOhCyaDV$13W>F&wX<
zGJFerpx4EjQvk`R2h&ig8XBn2!({3!Fa$rrNIZldJb`<$(`YAvb2x!|_KI)0pG*6V_&>&y=Di6W;D3QIf1l54H%0AX$B+NG*zgMuc3B(%6R8>TZlcWpTH!%
zjk+&_uZcJVb((zmF@BHywwX;_d`0K~0tL;u#Uv*sshCIoHB^T?P`mXEYNmroY(DC)b%3N4_OJuGrn0yL7T`%t?gmd=K31b@i{iZ
z^r_A<%0m5KOv4C#1C^1VqBiSJ)EXZTv|mOy_3x37Ntotj_8s&Rq&ZK4$ry{ns-Ma?
zQ8(73&Ufr|=XHAmb$$mGImhum)bsoBQ+$rf)Tc9?iS(N3WM(od!|PF*J&0P;`!mVE
zj$8j(&g-@av#3{LG+sbG*nrh&ik)-+3k;@u43(+RQ7LUe9kU0hR6h>*FI1+Q%r<5$
zMxjYesz|i#ps0iPgs3+5ji}mC%PLgEbUdkWNwb{bicW-z_gp&B?G)}|LTMO5BK|b
zR$F&{mHu5dR^z^njrN|qbw{#$7yoC@meshmx^ewxQed~p9Mi*JxxMjNW#is@%fG$y
zUd?uEl&7S$cv$)Dg{5Vdzj6=#+^gA2ANI4BHFjLq{GQ~m@$*%8kF2t2ZCt, 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 fe96d40e5441640d4c7f563b97e3e98e44b1e35c..4e6e51ce1809030467c75beb68db3412d93469de 100644
GIT binary patch
delta 5183
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
delta 4388
zcmaLYdvKK18OQOH3j}f__k>GeNhIN7!V;1|F2(?Xgb)xRNQkIxl9#v=vN0DB3NF$K
zRuExWw9V8~bjVOeoRY0mY>}1O;ma4QMcFHi&5qkOlc;Alx)y!r;=bZO_
z&*gc}dH2wD`~wN$FB<;7;C~eV8zNNu`tM?_G3iwQgk$hFx^d(%WA4Wq9D&bc
z67I(oJc2{;EQa7kjK%@{3tq)MWBlfWIAaQE2#q&pGET>Od>pg!U3``vu3{1OjzoKa
zgBV8rIMRhVi7|K{HId86T+JOEicvJ`zGS4yWMM4hn_>zRXqf9<=)ghLpT$Dlj#YRZ
zt1%|oo^Tzi!xvBk{1Bt?HPpo3!UTL9d+-zv#+8I816N}zi9ZpVz*E$3S%}(&2Uuv7_7uecrSL~M%;@Z;pmYJhBt8%E@O82*p1rE
zKO05-r&G8o=V1cl;F8@i3;NTxX(YR?L@jSC7isDpW)^qC&kHHSiA9Kz*p^PoO4p5y^tN
zg$j9`%YJS&YO_v4MbckDK`Sglg?Jfi#y-@8PdW81sF3eKW@T(1SCn
zuSZ4p9n?Z@q9z`}tao4%5)r@IM?s-JfK1k$K;8HmYUS5aD+wpwYEMTEI1v?*a>v=Y
zlzKJx;;X2MR^4MC*C+8_>ibaroTmg^Te3F2MhwCbEFpy~6nBTNH9Jox|+H8dQg?k&oHx
z_!DFfW&mq3e4;U%a2e{&c>z~oBwIZXSK%PsgOB1qR7%4bJq+XV?)guqFocE?sE}u(
zHdO&?1y$%m4{D&zsE+$k6FrQ&??a5hFHz6m#8@1fWACvv)cu9XT+QMf;=hE#(==4!
zIh=**gku_dupE1^1TWwQOkoz?7(f;$(q-O3{oG!`BI@mgg?E&B12sTD#^E`~&oGJl
zO^n4T@+3!~+9zNlmO1Tr$KG$YQBY`lk;R(>s2qNR3vqm@J=1llfe)fWdlaMa
zBx*OGL#60r?7^$3`??7)uMo2X71=&iN>5|7&i@?>ku(e~vqPGM%Go5;-k6GASdW_d
zY3KS^m`pvCyvQ_+$6VCJ%AI{y4R{=t(rc*5WmMR|2{rgM_3jGd{~Ze9v+do!
z9hIYls0sC>Hq%+m#7n4MJa~?M3W`t>szpWQ5!7>SPWw|%{TbAPo
zhPikFc?X%H^Nnf3a%|N3@1+o}3k&QSrl4}2j`V3}AZa(-aWS4n?fUEo?4R2TR7iuU
z6ughR?=osLmMpaQ%pQD&`WaM2J08@;$p6a}v>Ezw0$y^AUS$8=7NUpt<*40$6gm2)
zgi%)Ddd$N=qH-KtYyUPRVGQ*S48vzo5$wiT+=}UpZ+a-`T>ccbf-|TTT*0Xrv&8Or
z25RM%sQa2Q0yknJc02aq-BX0RzaJ;!Uy+YVe8~Q_^`iEl>7yXO!g8Fs)DGddaTE2A
zup8^@>`ga-N>TJOV@lDD&A1vn@IxGfbL;JhdQqD;fZB9@$lA>Ldg8Ac=00ry+|I*n
z>Kicudr>PrjE#5()p5ac`{#BErckfLNc3R@u6NvwO37A?!kx%F%e;&xV_ZjuD-as@
zMqqJVYT#nr>k%%OuRYS`3O*O#8Zz$jsbw>onye<5ueEeC6)xznw5@F1_$E)MHKC()
za$E35!nV+0cXCl^;9seUfy=20fe~rtfgNeLgS&<&4+->-wSq+%4WWU(_dF6zANOKN
z@N`yfM6fW|iU{>|296b^jaq3jhPTnzYFd2FE?-xtX|>i`?Z(&AWCcnKk4%}G0nbmH+d%$XUSyrpd)7a?iYVCCS
z+FVW6dds!eYUuEGT6$)(M>jixP%wNezfo~|t<2X=l~zN0mv@zGzSZRQRQeiPyshf-
z3Cm@9n;E6UYF}fuf8A*yB;kp`Z;E$LB+|7$tJzw^7qM^qKe4YZ*%uo8_k9(ifx7Y>
z;$9expAi!h%$nIbByhC4IhZ?dZ)o7`e1EWg!Tylow1tNwf+2NBB0_y_3jCP=1^%0n
Q_gY, 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 f58e6a45afb70117bd19a4d6cc97e5340153f3bf..f9666be3ef7b804db10d01c0ecbf7b37db773c74 100644
GIT binary patch
delta 5190
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
delta 4349
zcmZ|RdvKK18OQOH3*^QnBqW4O@FfrkmxK)=kz9&F36~^*3dlw3xUer_%VsxCwptKa
z#R4-5LV0T|?LdWs2v`PKFTui;a4T(bkl{8kNNJ0vg_KUI16on~{rT=p|7vElpL5Rp
zzUMsWIp@5|#|Psc?2n6F%Se3P@YBI>KYo`bsrJ90tKE#rrTPgzgkPZt`*t_x5v<2P
zxE6cjPRzzbn2hHz4zFStyoP_pTR6&?h&hvPOeqcVJ&YNNV{k4m!XbDJ*U-Z)ET`U*
z=??H~OrU-o>B5}Cu6P+0NIMd%xsNHBMx*Y_LYmBA?8f+}g2GT5CdV$cU?=KpungDX
zBs`9_*fq-ycs8oT*H8oe64P)ODzNu30}tXRJdK@kA?eA(M(oA-W&?!+d>fUbvzUt4
zkdOI0U*E1uFJt;sPsXJ<1Qqx;RL7@L1D-?1GM}LWydS&XHOCl|XnLaV8;p@e3gr|O
z`B>BdwaCZ#`O@01jJ0n@t?40DYEPh^KaUFhGHMTfhKy+vdb|DgMJ;6oYKi8fCfwAU
z{8KiY_$tFFYNj_)9p6C(b`Le91ftQ>^hUKmgcET%j=&aNj&I^6?BAEc@GcI=IYc)a
zSD`lZhyBR^7z$TtSb>>r^(D9w8Pjwj9oqeaQJZEwYUZOI^vllgi-=k7|
z7L~CZs3rPG?E2@i>-QrR)Nyyh(OM5gMOML=)^09p%@(6FvK*D_m8gN&qXs&Fdj13|
zkgLcln0u&{r(5oG{ZX5BI4YBoQVN=3B`U>pP!Wev5B@M#UyVxndeqwe0$1a4)N^$M
z+yTA#DD|bN%pOKfL3VLCqwQe5*YdHQ+E*
zMyg}h;4JF3xC6JL0-ZF-J+9x!5!830GISn`b^iZJVJ-~=@{L)5%TP1Dj)~ZT^kx2q
zb(l5Sm>Trr1l)<*^|vvIX+zxIzZ4btMx2g&a4J4P1u~WBwlcnXfkF}Ha+ocwM|IeU
ze9S8`-$i0D*Kh_V4m0LOoP&CEUcqNEm90Js7h@;fg3sV~)RHDJdII*qZ_j@gg=8A~
zpi({%wW&%`Gnj-HdQk(dM0I=s6=*B!z6+Ryw^7gE#cr5V=oW2&DOK+ItwEAug4i9m
zV;a7Tn(-0rf~Qb{T)-vR5xc&S^lHE$Y9c>IE$J>y(fPkXK^^@mc0+rt{s41nPa4br
z2AGc)hEVr!K+Wupm^)D!dLK2R-(n9ufeQQ*>V49Vsn~)2b^h;B(2dzFuu@xq`B;VO
za6YPo#i)*7K+X6i?2E6VX1*IOY(vfXFR1%FRlA!z4f{}^fc5Cbh-R{vf?f#kqc+Wl
zsNH@X)xjmyntp<0)!af2P{0Oh!aBT;htQ9kA9dewNt|W&vl)#R`cX^y3O3`B$H;$}
zLdkeHvbRy2<``;bS5bj{fdeqD#%(W*IT<_CZlh8fz(jl=mAPf839dqI)^(`AHCs>_
zYpsd6Z=^FcXj65>`~uZc;siIw`SK|cKKp(~0+mYm$lu7P+o{9?aMbwNP+<@Cr
z0hCU52d+c~5}86l7XqjUn`0MNp=Poj)zLmwM%pkLPa+4zoWX6_wbsqhKGZQjhkAo1
z)VZlHMT>epK8cO^gwFpF3Mn*XuqD&5A1b8m;#yP&w&Ftk4QeKNQ{1H-
zhtsJ)gVlHddAXW@<4PPd)!l@UF3!Uy2%dGp@h`I1-B=
zcmLt=Vj=Z|*csbVr{p&3x#3JxnX8UjgId~J%w~KulY%x=01I#pTDT8Acowxp@#IaJ
zNk+ZN2B9)nh3Pl}yWlL;gnXEROK~`^L%K2tu?EvfQ$(BR2@0CgPjNJ!L}lPBT#LhI
z@NU2lQ1=CAx__Lupz23)5#B*RKK+!tbSF@6(5u)3|AWeCmsxIxM$RJtN>PA@VfYdb
z#dk0hFQR6A6Y1M@p6#yjJXA`TpgLTEakv$e@K>me?TNV`m8lO