aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mobin9631 -> 11549 bytes
-rw-r--r--mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po108
-rw-r--r--mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mobin9020 -> 10915 bytes
-rw-r--r--mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po128
-rw-r--r--mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po107
-rw-r--r--mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mobin8804 -> 10738 bytes
-rw-r--r--mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po130
-rw-r--r--mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mobin9151 -> 11114 bytes
-rw-r--r--mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po192
-rw-r--r--mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mobin9314 -> 11232 bytes
-rw-r--r--mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po110
-rw-r--r--mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mobin9266 -> 11184 bytes
-rw-r--r--mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po106
-rw-r--r--mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mobin8737 -> 10655 bytes
-rw-r--r--mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po106
-rw-r--r--mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mobin8343 -> 10261 bytes
-rw-r--r--mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po106
-rw-r--r--mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mobin8690 -> 10608 bytes
-rw-r--r--mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po106
-rw-r--r--mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mobin9008 -> 10955 bytes
-rw-r--r--mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po118
-rw-r--r--mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mobin11125 -> 13306 bytes
-rw-r--r--mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po126
-rw-r--r--mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mobin8806 -> 10724 bytes
-rw-r--r--mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po106
-rw-r--r--mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mobin8669 -> 10587 bytes
-rw-r--r--mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po106
-rw-r--r--mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mobin8930 -> 10836 bytes
-rw-r--r--mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po126
-rw-r--r--mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mobin8545 -> 10463 bytes
-rw-r--r--mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po106
-rw-r--r--mediagoblin/templates/mediagoblin/root.html13
32 files changed, 1539 insertions, 361 deletions
diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo
index d02639a9..146a588f 100644
--- a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo
+++ b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo
Binary files differ
diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po
index 112c6973..eb1c5f2d 100644
--- a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po
@@ -2,15 +2,16 @@
# Copyright (C) 2011 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
#
+# Translators:
# Majid Al-Dharrab <majid@aldharrab.com>, 2011.
-# <osamak@gnu.org>, 2011.
# <Omar.w.kh@gmail.com>, 2011.
+# <osamak@gnu.org>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2011-09-05 23:31-0500\n"
-"PO-Revision-Date: 2011-09-06 04:31+0000\n"
+"POT-Creation-Date: 2011-09-11 16:16-0500\n"
+"PO-Revision-Date: 2011-09-11 21:16+0000\n"
"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -20,43 +21,43 @@ 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:24 mediagoblin/auth/forms.py:48
+#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:49
msgid "Username"
msgstr "اسم المستخدم"
-#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:53
msgid "Password"
msgstr "كلمة السر"
-#: mediagoblin/auth/forms.py:34
+#: mediagoblin/auth/forms.py:35
msgid "Passwords must match."
msgstr "يجب أن تتطابق كلمتا السر."
-#: mediagoblin/auth/forms.py:36
+#: mediagoblin/auth/forms.py:37
msgid "Confirm password"
msgstr "أكّد كلمة السر"
-#: mediagoblin/auth/forms.py:38
+#: mediagoblin/auth/forms.py:39
msgid "Type it again here to make sure there are no spelling mistakes."
msgstr "اكتبها مرة أخرى هنا للتأكد من عدم وجود أخطاء إملائية."
-#: mediagoblin/auth/forms.py:41
+#: mediagoblin/auth/forms.py:42
msgid "Email address"
msgstr "عنوان البريد الإلكتروني"
-#: mediagoblin/auth/views.py:40
+#: mediagoblin/auth/views.py:42
msgid "Sorry, registration is disabled on this instance."
msgstr "عفوًا، التسجيل غير متاح هنا."
-#: mediagoblin/auth/views.py:58
+#: mediagoblin/auth/views.py:60
msgid "Sorry, a user with that name already exists."
msgstr "عذرًا، لقد اختار مستخدم آخر هذا الاسم."
-#: mediagoblin/auth/views.py:62
+#: mediagoblin/auth/views.py:64
msgid "Sorry, that email address has already been taken."
msgstr "عفوًا، هذا العنوان البريدي مستخدم."
-#: mediagoblin/auth/views.py:160
+#: mediagoblin/auth/views.py:165
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
@@ -64,15 +65,20 @@ msgstr ""
"تم التحقق من بريدك الإلكتروني. يمكنك الآن الولوج، وتحرير ملفك الشخصي، ونشر "
"الصور!"
-#: mediagoblin/auth/views.py:166
+#: mediagoblin/auth/views.py:171
msgid "The verification key or user id is incorrect"
msgstr "مفتاح التحقق أو معرف المستخدم خاطئ"
-#: mediagoblin/auth/views.py:187
-#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22
+#: mediagoblin/auth/views.py:192
msgid "Resent your verification email."
msgstr "أعدنا إرسال رسالة التحقق."
+#: mediagoblin/auth/views.py:228
+msgid ""
+"Could not send password recovery email as your username is inactive or your "
+"account's email address has not been verified."
+msgstr ""
+
#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27
msgid "Title"
msgstr "العنوان"
@@ -110,7 +116,7 @@ msgstr ""
msgid "You are editing another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:154
msgid "You are editing a user's profile. Proceed with caution."
msgstr ""
@@ -185,6 +191,10 @@ msgid ""
"href=\"http://gnu.org/\">GNU</a> project"
msgstr ""
+#: mediagoblin/templates/mediagoblin/root.html:24
+msgid "Explore"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/root.html:27
msgid "Hi there, media lover! MediaGoblin is..."
msgstr "مرحبًا بكم يا محبي الوسائط! ميدياغوبلن هو..."
@@ -225,6 +235,60 @@ msgid ""
" software!</a>)"
msgstr ""
+#: mediagoblin/templates/mediagoblin/root.html:38
+msgid "Excited to join us?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:39
+#, python-format
+msgid ""
+"\n"
+" <a class=\"header_submit_highlight\" href=\"%(register_url)s\">Create a free account</a>\n"
+" or\n"
+" <a class=\"header_submit\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:53
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:27
+msgid "Enter your new password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
+msgid "Enter your username or email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_changed_success.html:22
+msgid ""
+"\n"
+" Your password has been changed. Try to log in now.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_email_sent.html:22
+msgid ""
+"\n"
+" Check your inbox. We sent an email with a URL for changing your password.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to change your GNU MediaGoblin password, open the following URL in \n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you think this is an error, just ignore this email and continue being\n"
+"a happy goblin!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/login.html:29
msgid "Logging in failed!"
msgstr "فشل الولوج!"
@@ -237,6 +301,14 @@ msgstr "ألا تملك حسابًا بعد؟"
msgid "Create one here!"
msgstr "أنشئ حسابًا هنا!"
+#: mediagoblin/templates/mediagoblin/auth/login.html:48
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:51
+msgid "Change it!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/register.html:27
msgid "Create an account!"
msgstr "أنشئ حسابًا!"
@@ -432,7 +504,7 @@ msgstr "علِّق"
msgid "I am sure I want to delete this"
msgstr ""
-#: mediagoblin/user_pages/views.py:176
+#: mediagoblin/user_pages/views.py:175
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo
index d53cff8b..bb7538c2 100644
--- a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo
+++ b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo
Binary files differ
diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
index 8360ee93..3aaabce0 100644
--- a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
@@ -2,19 +2,20 @@
# Copyright (C) 2011 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
#
-# Rafael Maguiña <rafael.maguina@gmail.com>, 2011.
+# Translators:
# <benjamin@lebsanft.org>, 2011.
+# <cwebber@dustycloud.org>, 2011.
# Elrond <elrond+mediagoblin.org@samba-tng.org>, 2011.
+# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
# <mediagoblin.org@samba-tng.org>, 2011.
+# Rafael Maguiña <rafael.maguina@gmail.com>, 2011.
# Vinzenz Vietzke <vinz@fedoraproject.org>, 2011.
-# <cwebber@dustycloud.org>, 2011.
-# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2011-09-05 23:31-0500\n"
-"PO-Revision-Date: 2011-09-06 04:31+0000\n"
+"POT-Creation-Date: 2011-09-11 16:16-0500\n"
+"PO-Revision-Date: 2011-09-11 21:16+0000\n"
"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
"Language-Team: German (http://www.transifex.net/projects/p/mediagoblin/team/de/)\n"
"MIME-Version: 1.0\n"
@@ -24,43 +25,43 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:48
+#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:49
msgid "Username"
msgstr "Benutzername"
-#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:53
msgid "Password"
msgstr "Passwort"
-#: mediagoblin/auth/forms.py:34
+#: mediagoblin/auth/forms.py:35
msgid "Passwords must match."
msgstr "Passwörter müssen übereinstimmen."
-#: mediagoblin/auth/forms.py:36
+#: mediagoblin/auth/forms.py:37
msgid "Confirm password"
msgstr "Passwort wiederholen"
-#: mediagoblin/auth/forms.py:38
+#: mediagoblin/auth/forms.py:39
msgid "Type it again here to make sure there are no spelling mistakes."
msgstr "Hier nochmal eintragen, um Tippfehler zu verhindern."
-#: mediagoblin/auth/forms.py:41
+#: mediagoblin/auth/forms.py:42
msgid "Email address"
msgstr "Email-Adresse"
-#: mediagoblin/auth/views.py:40
+#: mediagoblin/auth/views.py:42
msgid "Sorry, registration is disabled on this instance."
msgstr "Registrierung ist auf dieser Instanz leider deaktiviert."
-#: mediagoblin/auth/views.py:58
+#: mediagoblin/auth/views.py:60
msgid "Sorry, a user with that name already exists."
msgstr "Leider gibt es bereits einen Benutzer mit diesem Namen."
-#: mediagoblin/auth/views.py:62
+#: mediagoblin/auth/views.py:64
msgid "Sorry, that email address has already been taken."
msgstr "Tut und Leid, aber diese Email-Adresse wird bereits verwendet."
-#: mediagoblin/auth/views.py:160
+#: mediagoblin/auth/views.py:165
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
@@ -68,15 +69,20 @@ msgstr ""
"Deine Email-Adresse wurde bestätigt. Du kannst dich nun anmelden, Dein "
"Profil bearbeiten und Bilder hochladen!"
-#: mediagoblin/auth/views.py:166
+#: mediagoblin/auth/views.py:171
msgid "The verification key or user id is incorrect"
msgstr "Der Bestätigungssschlüssel oder die Nutzernummer ist falsch."
-#: mediagoblin/auth/views.py:187
-#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22
+#: mediagoblin/auth/views.py:192
msgid "Resent your verification email."
msgstr "Bestätigungs-Email wurde erneut versandt."
+#: mediagoblin/auth/views.py:228
+msgid ""
+"Could not send password recovery email as your username is inactive or your "
+"account's email address has not been verified."
+msgstr ""
+
#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27
msgid "Title"
msgstr "Titel"
@@ -97,6 +103,8 @@ msgstr "Bitte gib einen Kurztitel ein"
msgid ""
"The title part of this media's URL. You usually don't need to change this."
msgstr ""
+"Der Titelteil der Medienadresse. Normalerweise muss hier nichts geändert "
+"werden."
#: mediagoblin/edit/forms.py:42
msgid "Bio"
@@ -114,7 +122,7 @@ msgstr "Diesen Kurztitel hast du bereits vergeben."
msgid "You are editing another user's media. Proceed with caution."
msgstr "Du bearbeitest die Medien eines Anderen. Bitte sei vorsichtig."
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:154
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Du bearbeitest das Profil eines Anderen. Bitte sei vorsichtig."
@@ -128,7 +136,7 @@ msgstr "Datei"
#: mediagoblin/submit/forms.py:30
msgid "Description of this work"
-msgstr ""
+msgstr "Beschreibung des Werkes"
#: mediagoblin/submit/views.py:47
msgid "You must provide a file."
@@ -189,8 +197,12 @@ msgid ""
"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
"href=\"http://gnu.org/\">GNU</a> project"
msgstr ""
-"Läuft mit &lt;a href=\"http://mediagoblin.org\"&gt;MediaGoblin&lt;/a&gt;, "
-"einem &lt;a href=\"http://gnu.org/\"&gt;GNU-Projekt&lt;/a&gt;"
+"Läuft mit <a href=\"http://mediagoblin.org/\">MediaGoblin</a>, einem <a "
+"href=\"http://gnu.org/\">GNU</a>-Projekt"
+
+#: mediagoblin/templates/mediagoblin/root.html:24
+msgid "Explore"
+msgstr ""
#: mediagoblin/templates/mediagoblin/root.html:27
msgid "Hi there, media lover! MediaGoblin is..."
@@ -242,6 +254,60 @@ msgstr ""
"href=\"http://mediagoblin.org/pages/join.html\">Du kannst uns dabei helfen, "
"die Software zu verbessern!</a>)"
+#: mediagoblin/templates/mediagoblin/root.html:38
+msgid "Excited to join us?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:39
+#, python-format
+msgid ""
+"\n"
+" <a class=\"header_submit_highlight\" href=\"%(register_url)s\">Create a free account</a>\n"
+" or\n"
+" <a class=\"header_submit\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:53
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:27
+msgid "Enter your new password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
+msgid "Enter your username or email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_changed_success.html:22
+msgid ""
+"\n"
+" Your password has been changed. Try to log in now.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_email_sent.html:22
+msgid ""
+"\n"
+" Check your inbox. We sent an email with a URL for changing your password.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to change your GNU MediaGoblin password, open the following URL in \n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you think this is an error, just ignore this email and continue being\n"
+"a happy goblin!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/login.html:29
msgid "Logging in failed!"
msgstr "Anmeldevorgang fehlgeschlagen!"
@@ -254,6 +320,14 @@ msgstr "Hast du noch kein Konto?"
msgid "Create one here!"
msgstr "Registriere dich!"
+#: mediagoblin/templates/mediagoblin/auth/login.html:48
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:51
+msgid "Change it!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/register.html:27
msgid "Create an account!"
msgstr "Neues Konto registrieren!"
@@ -327,7 +401,7 @@ msgstr "%(title)s wirklich löschen?"
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
msgid "Delete Permanently"
-msgstr ""
+msgstr "Dauerhaft löschen."
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
msgid "Media processing panel"
@@ -441,11 +515,11 @@ msgstr "Atom-Feed"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:40
msgid "Newer"
-msgstr ""
+msgstr "Neuere"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:46
msgid "Older"
-msgstr ""
+msgstr "Ältere"
#: mediagoblin/user_pages/forms.py:24
msgid "Comment"
@@ -453,9 +527,9 @@ msgstr "Kommentar"
#: mediagoblin/user_pages/forms.py:30
msgid "I am sure I want to delete this"
-msgstr ""
+msgstr "Ja, wirklich löschen"
-#: mediagoblin/user_pages/views.py:176
+#: mediagoblin/user_pages/views.py:175
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "Du versuchst Medien eines anderen Nutzers zu löschen. Sei vorsichtig."
diff --git a/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po
index 5818cd77..6ff8e8df 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: 2011-09-05 23:31-0500\n"
+"POT-Creation-Date: 2011-09-11 16:16-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,57 +17,62 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 0.9.6\n"
-#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:48
+#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:49
msgid "Username"
msgstr ""
-#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:53
msgid "Password"
msgstr ""
-#: mediagoblin/auth/forms.py:34
+#: mediagoblin/auth/forms.py:35
msgid "Passwords must match."
msgstr ""
-#: mediagoblin/auth/forms.py:36
+#: mediagoblin/auth/forms.py:37
msgid "Confirm password"
msgstr ""
-#: mediagoblin/auth/forms.py:38
+#: mediagoblin/auth/forms.py:39
msgid "Type it again here to make sure there are no spelling mistakes."
msgstr ""
-#: mediagoblin/auth/forms.py:41
+#: mediagoblin/auth/forms.py:42
msgid "Email address"
msgstr ""
-#: mediagoblin/auth/views.py:40
+#: mediagoblin/auth/views.py:42
msgid "Sorry, registration is disabled on this instance."
msgstr ""
-#: mediagoblin/auth/views.py:58
+#: mediagoblin/auth/views.py:60
msgid "Sorry, a user with that name already exists."
msgstr ""
-#: mediagoblin/auth/views.py:62
+#: mediagoblin/auth/views.py:64
msgid "Sorry, that email address has already been taken."
msgstr ""
-#: mediagoblin/auth/views.py:160
+#: mediagoblin/auth/views.py:165
msgid ""
"Your email address has been verified. You may now login, edit your "
"profile, and submit images!"
msgstr ""
-#: mediagoblin/auth/views.py:166
+#: mediagoblin/auth/views.py:171
msgid "The verification key or user id is incorrect"
msgstr ""
-#: mediagoblin/auth/views.py:187
-#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22
+#: mediagoblin/auth/views.py:192
msgid "Resent your verification email."
msgstr ""
+#: mediagoblin/auth/views.py:228
+msgid ""
+"Could not send password recovery email as your username is inactive or "
+"your account's email address has not been verified."
+msgstr ""
+
#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27
msgid "Title"
msgstr ""
@@ -104,7 +109,7 @@ msgstr ""
msgid "You are editing another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:154
msgid "You are editing a user's profile. Proceed with caution."
msgstr ""
@@ -178,6 +183,10 @@ msgid ""
"href=\"http://gnu.org/\">GNU</a> project"
msgstr ""
+#: mediagoblin/templates/mediagoblin/root.html:24
+msgid "Explore"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/root.html:27
msgid "Hi there, media lover! MediaGoblin is..."
msgstr ""
@@ -217,6 +226,64 @@ msgid ""
"this software!</a>)"
msgstr ""
+#: mediagoblin/templates/mediagoblin/root.html:38
+msgid "Excited to join us?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:39
+#, python-format
+msgid ""
+"\n"
+" <a class=\"header_submit_highlight\" "
+"href=\"%(register_url)s\">Create a free account</a>\n"
+" or\n"
+" <a class=\"header_submit\" "
+"href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on "
+"your own server</a>\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:53
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:27
+msgid "Enter your new password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
+msgid "Enter your username or email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_changed_success.html:22
+msgid ""
+"\n"
+" Your password has been changed. Try to log in now.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_email_sent.html:22
+msgid ""
+"\n"
+" Check your inbox. We sent an email with a URL for changing your "
+"password.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to change your GNU MediaGoblin password, open the following URL in \n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you think this is an error, just ignore this email and continue being\n"
+"a happy goblin!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/login.html:29
msgid "Logging in failed!"
msgstr ""
@@ -229,6 +296,14 @@ msgstr ""
msgid "Create one here!"
msgstr ""
+#: mediagoblin/templates/mediagoblin/auth/login.html:48
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:51
+msgid "Change it!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/register.html:27
msgid "Create an account!"
msgstr ""
@@ -414,7 +489,7 @@ msgstr ""
msgid "I am sure I want to delete this"
msgstr ""
-#: mediagoblin/user_pages/views.py:176
+#: mediagoblin/user_pages/views.py:175
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo
index 2502703b..b260cb16 100644
--- a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo
+++ b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo
Binary files differ
diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po
index 0b01e7b5..296f1b4b 100644
--- a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po
@@ -2,15 +2,16 @@
# Copyright (C) 2011 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
#
+# Translators:
# <deletesoftware@yandex.ru>, 2011.
-# <john_w1954@fastmail.fm>, 2011.
# Fernando Inocencio <faigos@gmail.com>, 2011.
+# <john_w1954@fastmail.fm>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2011-09-05 23:31-0500\n"
-"PO-Revision-Date: 2011-09-06 04:31+0000\n"
+"POT-Creation-Date: 2011-09-11 16:16-0500\n"
+"PO-Revision-Date: 2011-09-11 21:16+0000\n"
"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -20,43 +21,43 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:48
+#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:49
msgid "Username"
msgstr "Uzantnomo"
-#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:53
msgid "Password"
msgstr "Pasvorto"
-#: mediagoblin/auth/forms.py:34
+#: mediagoblin/auth/forms.py:35
msgid "Passwords must match."
msgstr "Pasvortoj devas esti egalaj."
-#: mediagoblin/auth/forms.py:36
+#: mediagoblin/auth/forms.py:37
msgid "Confirm password"
msgstr "Retajpu pasvorton"
-#: mediagoblin/auth/forms.py:38
+#: mediagoblin/auth/forms.py:39
msgid "Type it again here to make sure there are no spelling mistakes."
msgstr "Retajpu ĝin por certigi, ke ne okazis mistajpoj."
-#: mediagoblin/auth/forms.py:41
+#: mediagoblin/auth/forms.py:42
msgid "Email address"
msgstr "Retpoŝtadreso"
-#: mediagoblin/auth/views.py:40
+#: mediagoblin/auth/views.py:42
msgid "Sorry, registration is disabled on this instance."
msgstr "Bedaŭrinde, registrado estas malaktivigita en tiu ĉi instalaĵo."
-#: mediagoblin/auth/views.py:58
+#: mediagoblin/auth/views.py:60
msgid "Sorry, a user with that name already exists."
msgstr "Bedaŭrinde, uzanto kun tiu nomo jam ekzistas."
-#: mediagoblin/auth/views.py:62
+#: mediagoblin/auth/views.py:64
msgid "Sorry, that email address has already been taken."
msgstr "Tiu retpoŝtadreso jam estas uzata."
-#: mediagoblin/auth/views.py:160
+#: mediagoblin/auth/views.py:165
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
@@ -64,15 +65,20 @@ msgstr ""
"Via retpoŝtadreso estas konfirmita. Vi povas nun ensaluti, redakti vian "
"profilon, kaj alŝuti bildojn!"
-#: mediagoblin/auth/views.py:166
+#: mediagoblin/auth/views.py:171
msgid "The verification key or user id is incorrect"
msgstr "La kontrol-kodo aŭ la uzantonomo ne estas korekta"
-#: mediagoblin/auth/views.py:187
-#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22
+#: mediagoblin/auth/views.py:192
msgid "Resent your verification email."
msgstr "Resendi vian kontrol-mesaĝon."
+#: mediagoblin/auth/views.py:228
+msgid ""
+"Could not send password recovery email as your username is inactive or your "
+"account's email address has not been verified."
+msgstr ""
+
#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27
msgid "Title"
msgstr "Titolo"
@@ -93,6 +99,8 @@ msgstr "La distingiga adresparto ne povas esti malplena"
msgid ""
"The title part of this media's URL. You usually don't need to change this."
msgstr ""
+"La parto de la dosieradreso, bazita sur la dosiertitolo. Ordinare ne necesas"
+" ĝin ŝanĝi."
#: mediagoblin/edit/forms.py:42
msgid "Bio"
@@ -110,7 +118,7 @@ msgstr "Ĉi tiu uzanto jam havas dosieron kun tiu distingiga adresparto."
msgid "You are editing another user's media. Proceed with caution."
msgstr "Vi priredaktas dosieron de alia uzanto. Agu singardeme."
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:154
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Vi redaktas profilon de alia uzanto. Agu singardeme."
@@ -124,7 +132,7 @@ msgstr "Dosiero"
#: mediagoblin/submit/forms.py:30
msgid "Description of this work"
-msgstr ""
+msgstr "Priskribo de ĉi tiu verko"
#: mediagoblin/submit/views.py:47
msgid "You must provide a file."
@@ -140,7 +148,7 @@ msgstr "Hura! Alŝutitas!"
#: mediagoblin/templates/mediagoblin/404.html:21
msgid "Oops!"
-msgstr ""
+msgstr "Oj!"
#: mediagoblin/templates/mediagoblin/404.html:24
msgid "There doesn't seem to be a page at this address. Sorry!"
@@ -188,6 +196,10 @@ msgstr ""
"Funkcias per &lt;a href=\"http://mediagoblin.org\"&gt;MediaGoblin&lt;/a&gt;,"
" unu el la &lt;a href=\"http://gnu.org/\"&gt;projektoj de GNU&lt;/a&gt;"
+#: mediagoblin/templates/mediagoblin/root.html:24
+msgid "Explore"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/root.html:27
msgid "Hi there, media lover! MediaGoblin is..."
msgstr "Saluton, artemulo! MediaGoblin estas…"
@@ -216,6 +228,7 @@ msgid ""
"Aiming to make the world a better place through decentralization and "
"(eventually, coming soon!) federation!"
msgstr ""
+"Celanta plibonigi la mondon per sencentreco kaj (iam, baldaŭ!) federateco!"
#: mediagoblin/templates/mediagoblin/root.html:33
msgid ""
@@ -231,6 +244,63 @@ msgid ""
"href=\"http://mediagoblin.org/pages/join.html\">You can help us improve this"
" software!</a>)"
msgstr ""
+"Vivanta per homoj kiel vi. (&lt;a "
+"href=\"http://mediagoblin.org/pages/join.html\"&gt;Vi povas helpi al ni "
+"plibonigi la programon!&lt;/a&gt;)"
+
+#: mediagoblin/templates/mediagoblin/root.html:38
+msgid "Excited to join us?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:39
+#, python-format
+msgid ""
+"\n"
+" <a class=\"header_submit_highlight\" href=\"%(register_url)s\">Create a free account</a>\n"
+" or\n"
+" <a class=\"header_submit\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:53
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:27
+msgid "Enter your new password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
+msgid "Enter your username or email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_changed_success.html:22
+msgid ""
+"\n"
+" Your password has been changed. Try to log in now.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_email_sent.html:22
+msgid ""
+"\n"
+" Check your inbox. We sent an email with a URL for changing your password.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to change your GNU MediaGoblin password, open the following URL in \n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you think this is an error, just ignore this email and continue being\n"
+"a happy goblin!"
+msgstr ""
#: mediagoblin/templates/mediagoblin/auth/login.html:29
msgid "Logging in failed!"
@@ -244,6 +314,14 @@ msgstr "Ĉu ankoraŭ sen konto?"
msgid "Create one here!"
msgstr "Kreu ĝin ĉi tie!"
+#: mediagoblin/templates/mediagoblin/auth/login.html:48
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:51
+msgid "Change it!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/register.html:27
msgid "Create an account!"
msgstr "Kreu konton!"
@@ -317,7 +395,7 @@ msgstr "Ĉu efektive forigi %(title)s?"
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
msgid "Delete Permanently"
-msgstr ""
+msgstr "Forigi senrevene"
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
msgid "Media processing panel"
@@ -370,6 +448,8 @@ msgid ""
"Someone has registered an account with this username, but it still has to be"
" activated."
msgstr ""
+"Iu registris konton kun tiu ĉi uzantonomo, sed ĝi devas ankoraŭ esti "
+"aktivigita."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:68
#, python-format
@@ -396,7 +476,7 @@ msgstr "Redakti profilon"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:96
msgid "This user hasn't filled in their profile (yet)."
-msgstr ""
+msgstr "Ĉi tiu uzanto ne jam aldonis informojn pri si."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:122
#, python-format
@@ -428,11 +508,11 @@ msgstr "Atom-a informfluo"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:40
msgid "Newer"
-msgstr ""
+msgstr "Plinovaj"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:46
msgid "Older"
-msgstr ""
+msgstr "Malplinovaj"
#: mediagoblin/user_pages/forms.py:24
msgid "Comment"
@@ -440,9 +520,9 @@ msgstr "Komento"
#: mediagoblin/user_pages/forms.py:30
msgid "I am sure I want to delete this"
-msgstr ""
+msgstr "Mi estas certa, ke mi volas forigi ĉi tion"
-#: mediagoblin/user_pages/views.py:176
+#: mediagoblin/user_pages/views.py:175
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "Vi estas forigonta dosieron de alia uzanto. Estu singardema."
diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo
index a8fc04ea..7c7dea0d 100644
--- a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo
+++ b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo
Binary files differ
diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
index 5b16f19d..85da5dbe 100644
--- a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
@@ -2,16 +2,18 @@
# Copyright (C) 2011 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
#
+# Translators:
# <ekenbrand@hotmail.com>, 2011.
-# <juangsub@gmail.com>, 2011.
# <jacobo@gnu.org>, 2011.
+# Javier Di Mauro <javierdimauro@gmail.com>, 2011.
+# <juangsub@gmail.com>, 2011.
# Mario Rodriguez <msrodriguez00@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2011-09-05 23:31-0500\n"
-"PO-Revision-Date: 2011-09-06 04:31+0000\n"
+"POT-Creation-Date: 2011-09-11 16:16-0500\n"
+"PO-Revision-Date: 2011-09-11 21:16+0000\n"
"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mediagoblin/team/es/)\n"
"MIME-Version: 1.0\n"
@@ -21,60 +23,65 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:48
+#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:49
msgid "Username"
msgstr "Nombre de Usuario"
-#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:53
msgid "Password"
msgstr "Contraseña"
-#: mediagoblin/auth/forms.py:34
+#: mediagoblin/auth/forms.py:35
msgid "Passwords must match."
msgstr "Las contraseñas deben coincidir."
-#: mediagoblin/auth/forms.py:36
+#: mediagoblin/auth/forms.py:37
msgid "Confirm password"
-msgstr "Confirme su contraseña"
+msgstr "Confirma tu contraseña"
-#: mediagoblin/auth/forms.py:38
+#: mediagoblin/auth/forms.py:39
msgid "Type it again here to make sure there are no spelling mistakes."
msgstr ""
"Escriba de nuevo aquí para asegurarse de que no hay faltas de ortografía."
-#: mediagoblin/auth/forms.py:41
+#: mediagoblin/auth/forms.py:42
msgid "Email address"
msgstr "Dirección de correo electrónico"
-#: mediagoblin/auth/views.py:40
+#: mediagoblin/auth/views.py:42
msgid "Sorry, registration is disabled on this instance."
msgstr "Lo sentimos, la registración está deshabilitado en este momento."
-#: mediagoblin/auth/views.py:58
+#: mediagoblin/auth/views.py:60
msgid "Sorry, a user with that name already exists."
msgstr "Lo sentimos, ya existe un usuario con ese nombre."
-#: mediagoblin/auth/views.py:62
+#: mediagoblin/auth/views.py:64
msgid "Sorry, that email address has already been taken."
-msgstr "Lo sentimos, su dirección de correo electrónico ya ha sido tomada."
+msgstr "Lo sentimos, esa dirección de correo electrónico ya ha sido tomada."
-#: mediagoblin/auth/views.py:160
+#: mediagoblin/auth/views.py:165
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr ""
-"Su dirección de correo electrónico ha sido verificada. ¡Ahora puede "
-"ingresar, editar su perfil, y enviar imágenes!"
+"Tu dirección de correo electrónico ha sido verificada. ¡Ahora puedes "
+"ingresar, editar tu perfil, y enviar imágenes!"
-#: mediagoblin/auth/views.py:166
+#: mediagoblin/auth/views.py:171
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:187
-#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22
+#: mediagoblin/auth/views.py:192
msgid "Resent your verification email."
-msgstr "Reenvíe su correo electrónico de verificación."
+msgstr "Se reenvió tu correo electrónico de verificación."
+
+#: mediagoblin/auth/views.py:228
+msgid ""
+"Could not send password recovery email as your username is inactive or your "
+"account's email address has not been verified."
+msgstr ""
#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27
msgid "Title"
@@ -96,6 +103,8 @@ msgstr "La ficha no puede estar vacía"
msgid ""
"The title part of this media's URL. You usually don't need to change this."
msgstr ""
+"La parte del título de la URL de este contenido. Normalmente no necesitas "
+"cambiar esto."
#: mediagoblin/edit/forms.py:42
msgid "Bio"
@@ -111,16 +120,15 @@ msgstr "Una entrada con esa ficha ya existe para este usuario."
#: mediagoblin/edit/views.py:84
msgid "You are editing another user's media. Proceed with caution."
-msgstr ""
-"Usted está editando el contenido de otro usuario. Proceder con precaución."
+msgstr "Estás editando el contenido de otro usuario. Proceder con precaución."
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:154
msgid "You are editing a user's profile. Proceed with caution."
-msgstr "Usted está editando un perfil de usuario. Proceder con precaución."
+msgstr "Estás editando un perfil de usuario. Proceder con precaución."
#: mediagoblin/process_media/errors.py:44
msgid "Invalid file given for media type."
-msgstr "Archivo inálido para el formato seleccionado."
+msgstr "Archivo inválido para el formato seleccionado."
#: mediagoblin/submit/forms.py:25
msgid "File"
@@ -128,11 +136,11 @@ msgstr "Archivo"
#: mediagoblin/submit/forms.py:30
msgid "Description of this work"
-msgstr ""
+msgstr "Descripción de esta obra"
#: mediagoblin/submit/views.py:47
msgid "You must provide a file."
-msgstr "Usted debe proporcionar un archivo."
+msgstr "Debes proporcionar un archivo."
#: mediagoblin/submit/views.py:50
msgid "The file doesn't seem to be an image!"
@@ -155,12 +163,12 @@ msgid ""
"If you're sure the address is correct, maybe the page you're looking for has"
" been moved or deleted."
msgstr ""
-"Si estas seguro que la dirección es correcta, puede ser que la pagina halla "
+"Si estás seguro que la dirección es correcta, puede ser que la pagina haya "
"sido movida o borrada."
#: mediagoblin/templates/mediagoblin/404.html:32
msgid "Image of 404 goblin stressing out"
-msgstr "404 el goblin esta estresado"
+msgstr "Imagen de 404 goblin estresándose"
#: mediagoblin/templates/mediagoblin/base.html:22
msgid "GNU MediaGoblin"
@@ -176,7 +184,7 @@ msgstr "Enviar contenido"
#: mediagoblin/templates/mediagoblin/base.html:63
msgid "verify your email!"
-msgstr "Verifique su correo electrónico"
+msgstr "Verifica tu correo electrónico!"
#: mediagoblin/templates/mediagoblin/base.html:73
#: mediagoblin/templates/mediagoblin/auth/login.html:26
@@ -190,20 +198,24 @@ msgid ""
"href=\"http://gnu.org/\">GNU</a> project"
msgstr ""
+#: mediagoblin/templates/mediagoblin/root.html:24
+msgid "Explore"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/root.html:27
msgid "Hi there, media lover! MediaGoblin is..."
-msgstr "Hola, amante de los medios de comunicación! MediaGoblin es ..."
+msgstr "Hola, amante de los contenidos! MediaGoblin es ..."
#: mediagoblin/templates/mediagoblin/root.html:29
msgid "The perfect place for your media!"
-msgstr "El lugar ideal para tus cosas!"
+msgstr "El lugar ideal para tus contenidos!"
#: mediagoblin/templates/mediagoblin/root.html:30
msgid ""
"A place for people to collaborate and show off original and derived "
"creations!"
msgstr ""
-"Un lugar para colaborar y exhibir tus creaciones orignales y derivadas"
+"Un lugar para colaborar y exhibir tus creaciones orignales y derivadas!"
#: mediagoblin/templates/mediagoblin/root.html:31
msgid ""
@@ -219,7 +231,7 @@ msgid ""
"(eventually, coming soon!) federation!"
msgstr ""
"Queriendo hacer del mundo un mejor lugar a través de la descentralización y "
-"(eventualmente!) la federalización!"
+"(eventualmente, muy pronto!) la federalización!"
#: mediagoblin/templates/mediagoblin/root.html:33
msgid ""
@@ -239,9 +251,63 @@ msgstr ""
"href=\"http://mediagoblin.org/pages/join.html\"> Vos podés ayudarnos a "
"mejorar este programa</a>)"
+#: mediagoblin/templates/mediagoblin/root.html:38
+msgid "Excited to join us?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:39
+#, python-format
+msgid ""
+"\n"
+" <a class=\"header_submit_highlight\" href=\"%(register_url)s\">Create a free account</a>\n"
+" or\n"
+" <a class=\"header_submit\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:53
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:27
+msgid "Enter your new password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
+msgid "Enter your username or email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_changed_success.html:22
+msgid ""
+"\n"
+" Your password has been changed. Try to log in now.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_email_sent.html:22
+msgid ""
+"\n"
+" Check your inbox. We sent an email with a URL for changing your password.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to change your GNU MediaGoblin password, open the following URL in \n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you think this is an error, just ignore this email and continue being\n"
+"a happy goblin!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/login.html:29
msgid "Logging in failed!"
-msgstr "Fallo el inicio de sesión!"
+msgstr "Falló el inicio de sesión!"
#: mediagoblin/templates/mediagoblin/auth/login.html:42
msgid "Don't have an account yet?"
@@ -251,6 +317,14 @@ msgstr "¿No tienes una cuenta?"
msgid "Create one here!"
msgstr "¡Crea una aquí!"
+#: mediagoblin/templates/mediagoblin/auth/login.html:48
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:51
+msgid "Change it!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/register.html:27
msgid "Create an account!"
msgstr "¡Crea una cuenta!"
@@ -269,8 +343,11 @@ msgid ""
"\n"
"%(verification_url)s"
msgstr ""
-"Hola %(username)s , para activar su cuenta GNU MediaGoblin, abra la "
-"siguiente URL en su navegador: %(verification_url)s "
+"Hola %(username)s,\n"
+"\n"
+"para activar tu cuenta de GNU MediaGoblin, abre la siguiente URL en tu navegador:\n"
+"\n"
+"%(verification_url)s "
#: mediagoblin/templates/mediagoblin/edit/edit.html:29
#, python-format
@@ -285,7 +362,7 @@ msgstr "Cancelar"
#: mediagoblin/templates/mediagoblin/edit/edit.html:37
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
msgid "Save changes"
-msgstr "Salvar cambios"
+msgstr "Guardar cambios"
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29
#, python-format
@@ -298,7 +375,7 @@ msgstr "Contenido etiquetado con:"
#: mediagoblin/templates/mediagoblin/submit/start.html:26
msgid "Submit yer media"
-msgstr "Envíe su contenido"
+msgstr "Envía tu contenido"
#: mediagoblin/templates/mediagoblin/submit/start.html:29
msgid "Submit"
@@ -312,16 +389,16 @@ msgstr "Contenido de <a href=\"%(user_url)s\">%(username)s</a>'s"
#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:52
#: mediagoblin/templates/mediagoblin/user_pages/user.html:32
msgid "Sorry, no such user found."
-msgstr "Lo sentimos, no se ha encontrado ese usuario."
+msgstr "Lo sentimos, no se encontró ese usuario."
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
msgid "Really delete %(title)s?"
-msgstr "Realmente desea eliminar %(title)s ?"
+msgstr "Realmente deseas eliminar %(title)s ?"
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
msgid "Delete Permanently"
-msgstr ""
+msgstr "Eliminar permanentemente"
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
msgid "Media processing panel"
@@ -359,8 +436,8 @@ msgstr "Casi terminas! Solo falta activar la cuenta."
msgid ""
"An email should arrive in a few moments with instructions on how to do so."
msgstr ""
-"Un e-mail debería llegar en unos momentos con las instrucciones para "
-"hacerlo."
+"En unos momentos te debería llegar un correo electrónico con las "
+"instrucciones para hacerlo."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:51
msgid "In case it doesn't:"
@@ -384,13 +461,13 @@ msgid ""
"If you are that person but you've lost your verification email, you can <a "
"href=\"%(login_url)s\">log in</a> and resend it."
msgstr ""
-"Si usted es esa persona, pero ha perdido su correo electrónico de "
-"verificación, puede <a href=\"%(login_url)s\">acceder</a> y reenviarlo."
+"Si tú eres esa persona, pero has perdido tu correo electrónico de "
+"verificación, puedes <a href=\"%(login_url)s\">acceder</a> y reenviarlo."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:78
#, python-format
msgid "%(username)s's profile"
-msgstr "Perfil de %(username)s's"
+msgstr "Perfil de %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:85
msgid "Here's a spot to tell others about yourself."
@@ -408,15 +485,14 @@ msgstr "Este usuario (todavia) no ha completado su perfil."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:122
#, python-format
msgid "View all of %(username)s's media"
-msgstr "Ver todo el contenido de %(username)s's "
+msgstr "Ver todo el contenido de %(username)s"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:135
msgid ""
"This is where your media will appear, but you don't seem to have added "
"anything yet."
msgstr ""
-"Aquí es donde tú contenido estará, pero parece que no haz agregado contenido"
-" todavia."
+"Aquí es donde tú contenido estará, pero parece que aún no has agregado nada."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:141
msgid "Add media"
@@ -424,7 +500,7 @@ msgstr "Añadir contenido"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:147
msgid "There doesn't seem to be any media here yet..."
-msgstr "Parece que no hay ningún contenido aquí todavia..."
+msgstr "Parece que aún no hay ningún contenido aquí..."
#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
msgid "feed icon"
@@ -436,11 +512,11 @@ msgstr "Atom feed"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:40
msgid "Newer"
-msgstr ""
+msgstr "Recientes"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:46
msgid "Older"
-msgstr ""
+msgstr "Antiguas"
#: mediagoblin/user_pages/forms.py:24
msgid "Comment"
@@ -448,12 +524,12 @@ msgstr "Comentario"
#: mediagoblin/user_pages/forms.py:30
msgid "I am sure I want to delete this"
-msgstr ""
+msgstr "Estoy seguro de que quiero borrar esto"
-#: mediagoblin/user_pages/views.py:176
+#: mediagoblin/user_pages/views.py:175
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
-"Usted está a punto de eliminar un medio de otro usuario. Proceder con "
-"cautela."
+"Estás a punto de eliminar un contenido de otro usuario. Proceder con "
+"precaución."
diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo
index 93e218e8..baab45ab 100644
--- a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo
+++ b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo
Binary files differ
diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po
index 51b60aec..032399d6 100644
--- a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po
@@ -2,17 +2,18 @@
# Copyright (C) 2011 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
#
+# Translators:
# <joehillen@gmail.com>, 2011.
-# <maxineb@members.fsf.org>, 2011.
# <marktraceur@gmail.com>, 2011.
-# Valentin Villenave <valentin@villenave.net>, 2011.
+# <maxineb@members.fsf.org>, 2011.
# <transifex@wandborg.se>, 2011.
+# Valentin Villenave <valentin@villenave.net>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2011-09-05 23:31-0500\n"
-"PO-Revision-Date: 2011-09-06 04:31+0000\n"
+"POT-Creation-Date: 2011-09-11 16:16-0500\n"
+"PO-Revision-Date: 2011-09-11 21:16+0000\n"
"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -22,45 +23,45 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:48
+#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:49
msgid "Username"
msgstr "Nom d'utilisateur"
-#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:53
msgid "Password"
msgstr "Mot de passe"
-#: mediagoblin/auth/forms.py:34
+#: mediagoblin/auth/forms.py:35
msgid "Passwords must match."
msgstr "Les mots de passe doivent correspondre."
-#: mediagoblin/auth/forms.py:36
+#: mediagoblin/auth/forms.py:37
msgid "Confirm password"
msgstr "Confirmer le mot de passe"
-#: mediagoblin/auth/forms.py:38
+#: mediagoblin/auth/forms.py:39
msgid "Type it again here to make sure there are no spelling mistakes."
msgstr ""
"Tapez-le à nouveau ici pour vous assurer qu'il n'ya pas de fautes "
"d'orthographe."
-#: mediagoblin/auth/forms.py:41
+#: mediagoblin/auth/forms.py:42
msgid "Email address"
msgstr "Adresse e-mail"
-#: mediagoblin/auth/views.py:40
+#: mediagoblin/auth/views.py:42
msgid "Sorry, registration is disabled on this instance."
msgstr "L'inscription n'est pas activée sur ce serveur, désolé."
-#: mediagoblin/auth/views.py:58
+#: mediagoblin/auth/views.py:60
msgid "Sorry, a user with that name already exists."
msgstr "Un utilisateur existe déjà avec ce nom, désolé."
-#: mediagoblin/auth/views.py:62
+#: mediagoblin/auth/views.py:64
msgid "Sorry, that email address has already been taken."
msgstr "Désolé, cette adresse courriel a déjà été prise."
-#: mediagoblin/auth/views.py:160
+#: mediagoblin/auth/views.py:165
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
@@ -68,15 +69,20 @@ 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:166
+#: mediagoblin/auth/views.py:171
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:187
-#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22
+#: mediagoblin/auth/views.py:192
msgid "Resent your verification email."
msgstr "E-mail de vérification renvoyé."
+#: mediagoblin/auth/views.py:228
+msgid ""
+"Could not send password recovery email as your username is inactive or your "
+"account's email address has not been verified."
+msgstr ""
+
#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27
msgid "Title"
msgstr "Titre"
@@ -116,7 +122,7 @@ msgstr ""
"Vous vous apprêtez à modifier le média d'un autre utilisateur. Veuillez "
"prendre garde."
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:154
msgid "You are editing a user's profile. Proceed with caution."
msgstr ""
"Vous vous apprêtez à modifier le profil d'un utilisateur. Veuillez prendre "
@@ -196,6 +202,10 @@ msgstr ""
"Propulsé par <a href=\"http://mediagoblin.org\">MediaGoblin</a> , un <a "
"href=\"http://gnu.org/\">GNU</a> de projet"
+#: mediagoblin/templates/mediagoblin/root.html:24
+msgid "Explore"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/root.html:27
msgid "Hi there, media lover! MediaGoblin is..."
msgstr "Salut à tous, amateur de médias! MediaGoblin est ..."
@@ -246,6 +256,60 @@ msgstr ""
"href=\"http://mediagoblin.org/pages/join.html\">Vous pouvez nous aider à "
"améliorer ce logiciel!</a>)"
+#: mediagoblin/templates/mediagoblin/root.html:38
+msgid "Excited to join us?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:39
+#, python-format
+msgid ""
+"\n"
+" <a class=\"header_submit_highlight\" href=\"%(register_url)s\">Create a free account</a>\n"
+" or\n"
+" <a class=\"header_submit\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:53
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:27
+msgid "Enter your new password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
+msgid "Enter your username or email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_changed_success.html:22
+msgid ""
+"\n"
+" Your password has been changed. Try to log in now.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_email_sent.html:22
+msgid ""
+"\n"
+" Check your inbox. We sent an email with a URL for changing your password.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to change your GNU MediaGoblin password, open the following URL in \n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you think this is an error, just ignore this email and continue being\n"
+"a happy goblin!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/login.html:29
msgid "Logging in failed!"
msgstr "Connexion a échoué!"
@@ -258,6 +322,14 @@ msgstr "Pas encore de compte?"
msgid "Create one here!"
msgstr "Créez-en un ici!"
+#: mediagoblin/templates/mediagoblin/auth/login.html:48
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:51
+msgid "Change it!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/register.html:27
msgid "Create an account!"
msgstr "Créer un compte!"
@@ -461,7 +533,7 @@ msgstr "Commentaire"
msgid "I am sure I want to delete this"
msgstr ""
-#: mediagoblin/user_pages/views.py:176
+#: mediagoblin/user_pages/views.py:175
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. "
diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo
index 176bcb4d..efd3e3f4 100644
--- a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo
+++ b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo
Binary files differ
diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po
index 7f0c4716..79be3177 100644
--- a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po
@@ -2,13 +2,14 @@
# Copyright (C) 2011 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
#
+# Translators:
# <averym@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2011-09-05 23:31-0500\n"
-"PO-Revision-Date: 2011-09-06 04:31+0000\n"
+"POT-Creation-Date: 2011-09-11 16:16-0500\n"
+"PO-Revision-Date: 2011-09-11 21:16+0000\n"
"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -18,57 +19,62 @@ msgstr ""
"Language: ja\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:48
+#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:49
msgid "Username"
msgstr "ユーザネーム"
-#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:53
msgid "Password"
msgstr "パスワード"
-#: mediagoblin/auth/forms.py:34
+#: mediagoblin/auth/forms.py:35
msgid "Passwords must match."
msgstr "パスワードが一致している必要があります。"
-#: mediagoblin/auth/forms.py:36
+#: mediagoblin/auth/forms.py:37
msgid "Confirm password"
msgstr "パスワードを確認"
-#: mediagoblin/auth/forms.py:38
+#: mediagoblin/auth/forms.py:39
msgid "Type it again here to make sure there are no spelling mistakes."
msgstr ""
-#: mediagoblin/auth/forms.py:41
+#: mediagoblin/auth/forms.py:42
msgid "Email address"
msgstr "メールアドレス"
-#: mediagoblin/auth/views.py:40
+#: mediagoblin/auth/views.py:42
msgid "Sorry, registration is disabled on this instance."
msgstr "申し訳ありませんが、このインスタンスで登録は無効になっています。"
-#: mediagoblin/auth/views.py:58
+#: mediagoblin/auth/views.py:60
msgid "Sorry, a user with that name already exists."
msgstr "申し訳ありませんが、その名前を持つユーザーがすでに存在しています。"
-#: mediagoblin/auth/views.py:62
+#: mediagoblin/auth/views.py:64
msgid "Sorry, that email address has already been taken."
msgstr ""
-#: mediagoblin/auth/views.py:160
+#: mediagoblin/auth/views.py:165
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "メアドが確認されています。これで、ログインしてプロファイルを編集し、画像を提出することができます!"
-#: mediagoblin/auth/views.py:166
+#: mediagoblin/auth/views.py:171
msgid "The verification key or user id is incorrect"
msgstr "検証キーまたはユーザーIDが間違っています"
-#: mediagoblin/auth/views.py:187
-#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22
+#: mediagoblin/auth/views.py:192
msgid "Resent your verification email."
msgstr "検証メールを再送しました。"
+#: mediagoblin/auth/views.py:228
+msgid ""
+"Could not send password recovery email as your username is inactive or your "
+"account's email address has not been verified."
+msgstr ""
+
#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27
msgid "Title"
msgstr "タイトル"
@@ -106,7 +112,7 @@ msgstr "そのスラグを持つエントリは、このユーザーは既に存
msgid "You are editing another user's media. Proceed with caution."
msgstr "あなたは、他のユーザーのメディアを編集しています。ご注意ください。"
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:154
msgid "You are editing a user's profile. Proceed with caution."
msgstr "あなたは、他のユーザーのプロファイルを編集しています。ご注意ください。"
@@ -180,6 +186,10 @@ msgid ""
"href=\"http://gnu.org/\">GNU</a> project"
msgstr ""
+#: mediagoblin/templates/mediagoblin/root.html:24
+msgid "Explore"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/root.html:27
msgid "Hi there, media lover! MediaGoblin is..."
msgstr ""
@@ -219,6 +229,60 @@ msgid ""
" software!</a>)"
msgstr ""
+#: mediagoblin/templates/mediagoblin/root.html:38
+msgid "Excited to join us?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:39
+#, python-format
+msgid ""
+"\n"
+" <a class=\"header_submit_highlight\" href=\"%(register_url)s\">Create a free account</a>\n"
+" or\n"
+" <a class=\"header_submit\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:53
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:27
+msgid "Enter your new password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
+msgid "Enter your username or email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_changed_success.html:22
+msgid ""
+"\n"
+" Your password has been changed. Try to log in now.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_email_sent.html:22
+msgid ""
+"\n"
+" Check your inbox. We sent an email with a URL for changing your password.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to change your GNU MediaGoblin password, open the following URL in \n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you think this is an error, just ignore this email and continue being\n"
+"a happy goblin!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/login.html:29
msgid "Logging in failed!"
msgstr ""
@@ -231,6 +295,14 @@ msgstr "まだアカウントを持っていませんか?"
msgid "Create one here!"
msgstr "ここで作成!"
+#: mediagoblin/templates/mediagoblin/auth/login.html:48
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:51
+msgid "Change it!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/register.html:27
msgid "Create an account!"
msgstr "アカウントを作成!"
@@ -423,7 +495,7 @@ msgstr ""
msgid "I am sure I want to delete this"
msgstr ""
-#: mediagoblin/user_pages/views.py:176
+#: mediagoblin/user_pages/views.py:175
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo
index e91b7235..261e5e95 100644
--- a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo
+++ b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo
Binary files differ
diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po
index b8feb0d7..b9e0896d 100644
--- a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po
@@ -2,13 +2,14 @@
# Copyright (C) 2011 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
#
+# Translators:
# <mail@jefvanschendel.nl>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2011-09-05 23:31-0500\n"
-"PO-Revision-Date: 2011-09-06 04:31+0000\n"
+"POT-Creation-Date: 2011-09-11 16:16-0500\n"
+"PO-Revision-Date: 2011-09-11 21:16+0000\n"
"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -18,43 +19,43 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:48
+#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:49
msgid "Username"
msgstr "Gebruikersnaam"
-#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:53
msgid "Password"
msgstr "Wachtwoord"
-#: mediagoblin/auth/forms.py:34
+#: mediagoblin/auth/forms.py:35
msgid "Passwords must match."
msgstr "Wachtwoorden moeten overeenkomen."
-#: mediagoblin/auth/forms.py:36
+#: mediagoblin/auth/forms.py:37
msgid "Confirm password"
msgstr "Bevestig wachtwoord"
-#: mediagoblin/auth/forms.py:38
+#: mediagoblin/auth/forms.py:39
msgid "Type it again here to make sure there are no spelling mistakes."
msgstr ""
-#: mediagoblin/auth/forms.py:41
+#: mediagoblin/auth/forms.py:42
msgid "Email address"
msgstr "E-mail adres"
-#: mediagoblin/auth/views.py:40
+#: mediagoblin/auth/views.py:42
msgid "Sorry, registration is disabled on this instance."
msgstr "Sorry, registratie is uitgeschakeld op deze instantie."
-#: mediagoblin/auth/views.py:58
+#: mediagoblin/auth/views.py:60
msgid "Sorry, a user with that name already exists."
msgstr "Sorry, er bestaat al een gebruiker met die naam."
-#: mediagoblin/auth/views.py:62
+#: mediagoblin/auth/views.py:64
msgid "Sorry, that email address has already been taken."
msgstr "Sorry, dat e-mailadres is al ingenomen."
-#: mediagoblin/auth/views.py:160
+#: mediagoblin/auth/views.py:165
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
@@ -62,15 +63,20 @@ msgstr ""
"Uw e-mailadres is geverifieerd. U kunt nu inloggen, uw profiel bewerken, en "
"afbeeldingen toevoegen!"
-#: mediagoblin/auth/views.py:166
+#: mediagoblin/auth/views.py:171
msgid "The verification key or user id is incorrect"
msgstr "De verificatie sleutel of gebruikers-ID is onjuist"
-#: mediagoblin/auth/views.py:187
-#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22
+#: mediagoblin/auth/views.py:192
msgid "Resent your verification email."
msgstr "Verificatie e-mail opnieuw opgestuurd."
+#: mediagoblin/auth/views.py:228
+msgid ""
+"Could not send password recovery email as your username is inactive or your "
+"account's email address has not been verified."
+msgstr ""
+
#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27
msgid "Title"
msgstr "Titel"
@@ -110,7 +116,7 @@ msgstr ""
"U bent de media van een andere gebruiker aan het aanpassen. Ga voorzichtig "
"te werk."
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:154
msgid "You are editing a user's profile. Proceed with caution."
msgstr ""
"U bent een gebruikersprofiel aan het aanpassen. Ga voorzichtig te werk."
@@ -185,6 +191,10 @@ msgid ""
"href=\"http://gnu.org/\">GNU</a> project"
msgstr ""
+#: mediagoblin/templates/mediagoblin/root.html:24
+msgid "Explore"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/root.html:27
msgid "Hi there, media lover! MediaGoblin is..."
msgstr ""
@@ -224,6 +234,60 @@ msgid ""
" software!</a>)"
msgstr ""
+#: mediagoblin/templates/mediagoblin/root.html:38
+msgid "Excited to join us?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:39
+#, python-format
+msgid ""
+"\n"
+" <a class=\"header_submit_highlight\" href=\"%(register_url)s\">Create a free account</a>\n"
+" or\n"
+" <a class=\"header_submit\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:53
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:27
+msgid "Enter your new password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
+msgid "Enter your username or email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_changed_success.html:22
+msgid ""
+"\n"
+" Your password has been changed. Try to log in now.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_email_sent.html:22
+msgid ""
+"\n"
+" Check your inbox. We sent an email with a URL for changing your password.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to change your GNU MediaGoblin password, open the following URL in \n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you think this is an error, just ignore this email and continue being\n"
+"a happy goblin!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/login.html:29
msgid "Logging in failed!"
msgstr ""
@@ -236,6 +300,14 @@ msgstr "Heeft u nog geen account?"
msgid "Create one here!"
msgstr "Maak er hier een!"
+#: mediagoblin/templates/mediagoblin/auth/login.html:48
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:51
+msgid "Change it!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/register.html:27
msgid "Create an account!"
msgstr "Maak een account aan!"
@@ -429,7 +501,7 @@ msgstr "Commentaar"
msgid "I am sure I want to delete this"
msgstr ""
-#: mediagoblin/user_pages/views.py:176
+#: mediagoblin/user_pages/views.py:175
msgid "You are about to delete another user's media. 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 1837c8da..9e4cf80f 100644
--- a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo
+++ b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo
Binary files differ
diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
index 5bbe2180..cc0e495a 100644
--- a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
@@ -2,13 +2,14 @@
# Copyright (C) 2011 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
#
+# Translators:
# <odin.omdal@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2011-09-05 23:31-0500\n"
-"PO-Revision-Date: 2011-09-06 04:31+0000\n"
+"POT-Creation-Date: 2011-09-11 16:16-0500\n"
+"PO-Revision-Date: 2011-09-11 21:16+0000\n"
"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -18,43 +19,43 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:48
+#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:49
msgid "Username"
msgstr "Brukarnamn"
-#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:53
msgid "Password"
msgstr "Passord"
-#: mediagoblin/auth/forms.py:34
+#: mediagoblin/auth/forms.py:35
msgid "Passwords must match."
msgstr "Passorda må vera like."
-#: mediagoblin/auth/forms.py:36
+#: mediagoblin/auth/forms.py:37
msgid "Confirm password"
msgstr "Gjenta passord"
-#: mediagoblin/auth/forms.py:38
+#: mediagoblin/auth/forms.py:39
msgid "Type it again here to make sure there are no spelling mistakes."
msgstr ""
-#: mediagoblin/auth/forms.py:41
+#: mediagoblin/auth/forms.py:42
msgid "Email address"
msgstr "E-postadresse"
-#: mediagoblin/auth/views.py:40
+#: mediagoblin/auth/views.py:42
msgid "Sorry, registration is disabled on this instance."
msgstr "Registrering er slege av. Orsak."
-#: mediagoblin/auth/views.py:58
+#: mediagoblin/auth/views.py:60
msgid "Sorry, a user with that name already exists."
msgstr "Ein konto med dette brukarnamnet finst allereide."
-#: mediagoblin/auth/views.py:62
+#: mediagoblin/auth/views.py:64
msgid "Sorry, that email address has already been taken."
msgstr "Den epostadressa er allereide teken."
-#: mediagoblin/auth/views.py:160
+#: mediagoblin/auth/views.py:165
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
@@ -62,15 +63,20 @@ msgstr ""
"E-postadressa di, og dimed kontoen din er stadfesta. Du kan no logga inn, "
"endra profilen din og lasta opp filer."
-#: mediagoblin/auth/views.py:166
+#: mediagoblin/auth/views.py:171
msgid "The verification key or user id is incorrect"
msgstr "Stadfestingsnykelen eller brukar-ID-en din er feil."
-#: mediagoblin/auth/views.py:187
-#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22
+#: mediagoblin/auth/views.py:192
msgid "Resent your verification email."
msgstr "Send ein ny stadfestingsepost."
+#: mediagoblin/auth/views.py:228
+msgid ""
+"Could not send password recovery email as your username is inactive or your "
+"account's email address has not been verified."
+msgstr ""
+
#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27
msgid "Title"
msgstr "Tittel"
@@ -108,7 +114,7 @@ msgstr "Eit innlegg med denne adressetittelen finst allereie."
msgid "You are editing another user's media. Proceed with caution."
msgstr "Ver forsiktig, du redigerer ein annan konto sitt innlegg."
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:154
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Ver forsiktig, du redigerer ein annan konto sin profil."
@@ -183,6 +189,10 @@ msgid ""
"href=\"http://gnu.org/\">GNU</a> project"
msgstr ""
+#: mediagoblin/templates/mediagoblin/root.html:24
+msgid "Explore"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/root.html:27
msgid "Hi there, media lover! MediaGoblin is..."
msgstr "Hei der mediaentusiast, MediaGoblin..."
@@ -229,6 +239,60 @@ msgstr ""
"href=\"http://mediagoblin.org/pages/join.html\">Du kan hjelpa med å forbetra"
" MediaGoblin</a>)"
+#: mediagoblin/templates/mediagoblin/root.html:38
+msgid "Excited to join us?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:39
+#, python-format
+msgid ""
+"\n"
+" <a class=\"header_submit_highlight\" href=\"%(register_url)s\">Create a free account</a>\n"
+" or\n"
+" <a class=\"header_submit\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:53
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:27
+msgid "Enter your new password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
+msgid "Enter your username or email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_changed_success.html:22
+msgid ""
+"\n"
+" Your password has been changed. Try to log in now.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_email_sent.html:22
+msgid ""
+"\n"
+" Check your inbox. We sent an email with a URL for changing your password.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to change your GNU MediaGoblin password, open the following URL in \n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you think this is an error, just ignore this email and continue being\n"
+"a happy goblin!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/login.html:29
msgid "Logging in failed!"
msgstr "Innlogging feila"
@@ -241,6 +305,14 @@ msgstr "Har du ingen konto?"
msgid "Create one here!"
msgstr "Lag ein!"
+#: mediagoblin/templates/mediagoblin/auth/login.html:48
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:51
+msgid "Change it!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/register.html:27
msgid "Create an account!"
msgstr "Lag ein konto."
@@ -435,7 +507,7 @@ msgstr "Innspel"
msgid "I am sure I want to delete this"
msgstr ""
-#: mediagoblin/user_pages/views.py:176
+#: mediagoblin/user_pages/views.py:175
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo
index 6c08c67a..686989fc 100644
--- a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo
+++ b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo
Binary files differ
diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po
index 190cab68..02054003 100644
--- a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po
@@ -2,13 +2,14 @@
# Copyright (C) 2011 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
#
+# Translators:
# <snd.noise@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2011-09-05 23:31-0500\n"
-"PO-Revision-Date: 2011-09-06 04:31+0000\n"
+"POT-Creation-Date: 2011-09-11 16:16-0500\n"
+"PO-Revision-Date: 2011-09-11 21:16+0000\n"
"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/mediagoblin/team/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -18,43 +19,43 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:48
+#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:49
msgid "Username"
msgstr "Nome de Usuário"
-#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:53
msgid "Password"
msgstr "Senha"
-#: mediagoblin/auth/forms.py:34
+#: mediagoblin/auth/forms.py:35
msgid "Passwords must match."
msgstr "Senhas devem ser iguais."
-#: mediagoblin/auth/forms.py:36
+#: mediagoblin/auth/forms.py:37
msgid "Confirm password"
msgstr "Confirmar senha"
-#: mediagoblin/auth/forms.py:38
+#: mediagoblin/auth/forms.py:39
msgid "Type it again here to make sure there are no spelling mistakes."
msgstr ""
-#: mediagoblin/auth/forms.py:41
+#: mediagoblin/auth/forms.py:42
msgid "Email address"
msgstr "Endereço de email"
-#: mediagoblin/auth/views.py:40
+#: mediagoblin/auth/views.py:42
msgid "Sorry, registration is disabled on this instance."
msgstr "Desculpa, o registro está desativado neste momento."
-#: mediagoblin/auth/views.py:58
+#: mediagoblin/auth/views.py:60
msgid "Sorry, a user with that name already exists."
msgstr "Desculpe, um usuário com este nome já existe."
-#: mediagoblin/auth/views.py:62
+#: mediagoblin/auth/views.py:64
msgid "Sorry, that email address has already been taken."
msgstr ""
-#: mediagoblin/auth/views.py:160
+#: mediagoblin/auth/views.py:165
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
@@ -62,15 +63,20 @@ msgstr ""
"O seu endereço de e-mail foi verificado. Você pode agora fazer login, editar"
" seu perfil, e enviar imagens!"
-#: mediagoblin/auth/views.py:166
+#: mediagoblin/auth/views.py:171
msgid "The verification key or user id is incorrect"
msgstr "A chave de verificação ou nome usuário estão incorretos."
-#: mediagoblin/auth/views.py:187
-#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22
+#: mediagoblin/auth/views.py:192
msgid "Resent your verification email."
msgstr "O email de verificação foi reenviado."
+#: mediagoblin/auth/views.py:228
+msgid ""
+"Could not send password recovery email as your username is inactive or your "
+"account's email address has not been verified."
+msgstr ""
+
#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27
msgid "Title"
msgstr "Título"
@@ -108,7 +114,7 @@ msgstr ""
msgid "You are editing another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:154
msgid "You are editing a user's profile. Proceed with caution."
msgstr ""
@@ -182,6 +188,10 @@ msgid ""
"href=\"http://gnu.org/\">GNU</a> project"
msgstr ""
+#: mediagoblin/templates/mediagoblin/root.html:24
+msgid "Explore"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/root.html:27
msgid "Hi there, media lover! MediaGoblin is..."
msgstr ""
@@ -221,6 +231,60 @@ msgid ""
" software!</a>)"
msgstr ""
+#: mediagoblin/templates/mediagoblin/root.html:38
+msgid "Excited to join us?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:39
+#, python-format
+msgid ""
+"\n"
+" <a class=\"header_submit_highlight\" href=\"%(register_url)s\">Create a free account</a>\n"
+" or\n"
+" <a class=\"header_submit\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:53
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:27
+msgid "Enter your new password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
+msgid "Enter your username or email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_changed_success.html:22
+msgid ""
+"\n"
+" Your password has been changed. Try to log in now.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_email_sent.html:22
+msgid ""
+"\n"
+" Check your inbox. We sent an email with a URL for changing your password.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to change your GNU MediaGoblin password, open the following URL in \n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you think this is an error, just ignore this email and continue being\n"
+"a happy goblin!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/login.html:29
msgid "Logging in failed!"
msgstr ""
@@ -233,6 +297,14 @@ msgstr "Ainda não tem conta?"
msgid "Create one here!"
msgstr "Crie uma aqui!"
+#: mediagoblin/templates/mediagoblin/auth/login.html:48
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:51
+msgid "Change it!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/register.html:27
msgid "Create an account!"
msgstr "Criar uma conta!"
@@ -427,7 +499,7 @@ msgstr ""
msgid "I am sure I want to delete this"
msgstr ""
-#: mediagoblin/user_pages/views.py:176
+#: mediagoblin/user_pages/views.py:175
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo
index 1fe03578..994d6f30 100644
--- a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo
+++ b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo
Binary files differ
diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po
index 38696aa4..967f7dbb 100644
--- a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po
@@ -2,13 +2,14 @@
# Copyright (C) 2011 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
#
+# Translators:
# <gapop@hotmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2011-09-05 23:31-0500\n"
-"PO-Revision-Date: 2011-09-06 04:31+0000\n"
+"POT-Creation-Date: 2011-09-11 16:16-0500\n"
+"PO-Revision-Date: 2011-09-11 21:16+0000\n"
"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -18,43 +19,43 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
-#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:48
+#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:49
msgid "Username"
msgstr "Nume de utilizator"
-#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:53
msgid "Password"
msgstr "Parolă"
-#: mediagoblin/auth/forms.py:34
+#: mediagoblin/auth/forms.py:35
msgid "Passwords must match."
msgstr "Parolele trebuie să fie identice."
-#: mediagoblin/auth/forms.py:36
+#: mediagoblin/auth/forms.py:37
msgid "Confirm password"
msgstr "Reintrodu parola"
-#: mediagoblin/auth/forms.py:38
+#: mediagoblin/auth/forms.py:39
msgid "Type it again here to make sure there are no spelling mistakes."
msgstr "Introdu parola din nou pentru verificare."
-#: mediagoblin/auth/forms.py:41
+#: mediagoblin/auth/forms.py:42
msgid "Email address"
msgstr "Adresa de e-mail"
-#: mediagoblin/auth/views.py:40
+#: mediagoblin/auth/views.py:42
msgid "Sorry, registration is disabled on this instance."
msgstr "Ne pare rău, dar înscrierile sunt dezactivate pe această instanță."
-#: mediagoblin/auth/views.py:58
+#: mediagoblin/auth/views.py:60
msgid "Sorry, a user with that name already exists."
msgstr "Ne pare rău, există deja un utilizator cu același nume."
-#: mediagoblin/auth/views.py:62
+#: mediagoblin/auth/views.py:64
msgid "Sorry, that email address has already been taken."
msgstr "Ne pare rău, această adresă de e-mail este deja rezervată."
-#: mediagoblin/auth/views.py:160
+#: mediagoblin/auth/views.py:165
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
@@ -62,15 +63,20 @@ msgstr ""
"Adresa ta de e-mail a fost confirmată. Poți să te autentifici, să îți "
"completezi profilul și să trimiți imagini!"
-#: mediagoblin/auth/views.py:166
+#: mediagoblin/auth/views.py:171
msgid "The verification key or user id is incorrect"
msgstr "Cheie de verificare sau user ID incorect."
-#: mediagoblin/auth/views.py:187
-#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22
+#: mediagoblin/auth/views.py:192
msgid "Resent your verification email."
msgstr "E-mail-ul de verificare a fost retrimis."
+#: mediagoblin/auth/views.py:228
+msgid ""
+"Could not send password recovery email as your username is inactive or your "
+"account's email address has not been verified."
+msgstr ""
+
#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27
msgid "Title"
msgstr "Titlu"
@@ -91,6 +97,8 @@ msgstr "Identificatorul nu poate să lipsească"
msgid ""
"The title part of this media's URL. You usually don't need to change this."
msgstr ""
+"Partea din adresa acestui fișier corespunzătoare titlului. De regulă nu "
+"trebuie modificată."
#: mediagoblin/edit/forms.py:42
msgid "Bio"
@@ -109,7 +117,7 @@ msgstr ""
msgid "You are editing another user's media. Proceed with caution."
msgstr "Editezi fișierul unui alt utilizator. Se recomandă prudență."
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:154
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Editezi profilul unui utilizator. Se recomandă prudență."
@@ -123,7 +131,7 @@ msgstr "Fișier"
#: mediagoblin/submit/forms.py:30
msgid "Description of this work"
-msgstr ""
+msgstr "Descrierea acestui fișier"
#: mediagoblin/submit/views.py:47
msgid "You must provide a file."
@@ -187,6 +195,10 @@ msgstr ""
"Construit cu <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un proiect "
"<a href=\"http://gnu.org/\">GNU</a>"
+#: mediagoblin/templates/mediagoblin/root.html:24
+msgid "Explore"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/root.html:27
msgid "Hi there, media lover! MediaGoblin is..."
msgstr "Bună! MediaGoblin este..."
@@ -236,6 +248,60 @@ msgstr ""
"href=\"http://mediagoblin.org/pages/join.html\">Ne poți ajuta să îmbunătățim"
" acest software!</a>)"
+#: mediagoblin/templates/mediagoblin/root.html:38
+msgid "Excited to join us?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:39
+#, python-format
+msgid ""
+"\n"
+" <a class=\"header_submit_highlight\" href=\"%(register_url)s\">Create a free account</a>\n"
+" or\n"
+" <a class=\"header_submit\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:53
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:27
+msgid "Enter your new password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
+msgid "Enter your username or email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_changed_success.html:22
+msgid ""
+"\n"
+" Your password has been changed. Try to log in now.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_email_sent.html:22
+msgid ""
+"\n"
+" Check your inbox. We sent an email with a URL for changing your password.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to change your GNU MediaGoblin password, open the following URL in \n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you think this is an error, just ignore this email and continue being\n"
+"a happy goblin!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/login.html:29
msgid "Logging in failed!"
msgstr "Autentificare eșuată!"
@@ -248,6 +314,14 @@ msgstr "Nu ai un cont?"
msgid "Create one here!"
msgstr "Creează-l aici!"
+#: mediagoblin/templates/mediagoblin/auth/login.html:48
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:51
+msgid "Change it!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/register.html:27
msgid "Create an account!"
msgstr "Creează un cont!"
@@ -321,7 +395,7 @@ msgstr "Sigur dorești să ștergi %(title)s?"
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
msgid "Delete Permanently"
-msgstr ""
+msgstr "Șterge definitiv"
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
msgid "Media processing panel"
@@ -432,11 +506,11 @@ msgstr "feed Atom"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:40
msgid "Newer"
-msgstr ""
+msgstr "Mai noi"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:46
msgid "Older"
-msgstr ""
+msgstr "Mai vechi"
#: mediagoblin/user_pages/forms.py:24
msgid "Comment"
@@ -444,9 +518,9 @@ msgstr "Scrie un comentariu"
#: mediagoblin/user_pages/forms.py:30
msgid "I am sure I want to delete this"
-msgstr ""
+msgstr "Sunt sigur că doresc să șterg"
-#: mediagoblin/user_pages/views.py:176
+#: mediagoblin/user_pages/views.py:175
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
"Urmează să ștergi fișierele media ale unui alt utilizator. Se recomandă "
diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo
index 35c8ed2d..2b698e4d 100644
--- a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo
+++ b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo
Binary files differ
diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po
index 6fd2322e..865f5424 100644
--- a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po
@@ -2,13 +2,14 @@
# Copyright (C) 2011 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
#
+# Translators:
# <deletesoftware@yandex.ru>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2011-09-05 23:31-0500\n"
-"PO-Revision-Date: 2011-09-06 04:31+0000\n"
+"POT-Creation-Date: 2011-09-11 16:16-0500\n"
+"PO-Revision-Date: 2011-09-11 21:16+0000\n"
"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -18,43 +19,43 @@ msgstr ""
"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:48
+#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:49
msgid "Username"
msgstr "Логин"
-#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:53
msgid "Password"
msgstr "Пароль"
-#: mediagoblin/auth/forms.py:34
+#: mediagoblin/auth/forms.py:35
msgid "Passwords must match."
msgstr "Пароли должны совпадать."
-#: mediagoblin/auth/forms.py:36
+#: mediagoblin/auth/forms.py:37
msgid "Confirm password"
msgstr "Подтвердите пароль"
-#: mediagoblin/auth/forms.py:38
+#: mediagoblin/auth/forms.py:39
msgid "Type it again here to make sure there are no spelling mistakes."
msgstr "Type it again here to make sure there are no spelling mistakes."
-#: mediagoblin/auth/forms.py:41
+#: mediagoblin/auth/forms.py:42
msgid "Email address"
msgstr "Адрес электронной почты"
-#: mediagoblin/auth/views.py:40
+#: mediagoblin/auth/views.py:42
msgid "Sorry, registration is disabled on this instance."
msgstr "Извините, на этом разделе регистрация запрещена."
-#: mediagoblin/auth/views.py:58
+#: mediagoblin/auth/views.py:60
msgid "Sorry, a user with that name already exists."
msgstr "Извините, пользователь с этим именем уже зарегистрирован."
-#: mediagoblin/auth/views.py:62
+#: mediagoblin/auth/views.py:64
msgid "Sorry, that email address has already been taken."
msgstr "Извините, этот адрес электнонной почты уже занят."
-#: mediagoblin/auth/views.py:160
+#: mediagoblin/auth/views.py:165
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
@@ -62,15 +63,20 @@ msgstr ""
"Адрес вашей электронной потвержден. Вы теперь можете войти и начать "
"редактировать свой профиль и загружать новые изображения!"
-#: mediagoblin/auth/views.py:166
+#: mediagoblin/auth/views.py:171
msgid "The verification key or user id is incorrect"
msgstr "Неверный ключ проверки или идентификатор пользователя"
-#: mediagoblin/auth/views.py:187
-#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22
+#: mediagoblin/auth/views.py:192
msgid "Resent your verification email."
msgstr "Переслать сообщение с подтверждением аккаунта."
+#: mediagoblin/auth/views.py:228
+msgid ""
+"Could not send password recovery email as your username is inactive or your "
+"account's email address has not been verified."
+msgstr ""
+
#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27
msgid "Title"
msgstr "Название"
@@ -91,6 +97,8 @@ msgstr "Отличительная часть адреса необходима"
msgid ""
"The title part of this media's URL. You usually don't need to change this."
msgstr ""
+"Часть адреса этого файла, производная от его названия. Её обычно не нужно "
+"изменять."
#: mediagoblin/edit/forms.py:42
msgid "Bio"
@@ -109,7 +117,7 @@ msgstr ""
msgid "You are editing another user's media. Proceed with caution."
msgstr "Вы редактируете файлы другого пользователя. Будьте осторожны."
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:154
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Вы редактируете профиль пользователя. Будьте осторожны."
@@ -123,7 +131,7 @@ msgstr "Файл"
#: mediagoblin/submit/forms.py:30
msgid "Description of this work"
-msgstr ""
+msgstr "Описание этого произведения"
#: mediagoblin/submit/views.py:47
msgid "You must provide a file."
@@ -183,6 +191,10 @@ msgid ""
"href=\"http://gnu.org/\">GNU</a> project"
msgstr ""
+#: mediagoblin/templates/mediagoblin/root.html:24
+msgid "Explore"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/root.html:27
msgid "Hi there, media lover! MediaGoblin is..."
msgstr "Привет, любитель мультимедиа! MediaGoblin это…"
@@ -203,7 +215,7 @@ msgstr ""
msgid ""
"Free, as in freedom. (We’re a <a href=\"http://gnu.org\">GNU</a> project, "
"after all.)"
-msgstr ""
+msgstr "Свободное ПО. (Мы же проект <a href=\"http://gnu.org\">GNU</a>.)"
#: mediagoblin/templates/mediagoblin/root.html:32
msgid ""
@@ -231,6 +243,60 @@ msgstr ""
"href=\"http://mediagoblin.org/pages/join.html\">Ты можешь помочь сделать это"
" ПО лучше!</a>)"
+#: mediagoblin/templates/mediagoblin/root.html:38
+msgid "Excited to join us?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:39
+#, python-format
+msgid ""
+"\n"
+" <a class=\"header_submit_highlight\" href=\"%(register_url)s\">Create a free account</a>\n"
+" or\n"
+" <a class=\"header_submit\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:53
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:27
+msgid "Enter your new password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
+msgid "Enter your username or email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_changed_success.html:22
+msgid ""
+"\n"
+" Your password has been changed. Try to log in now.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_email_sent.html:22
+msgid ""
+"\n"
+" Check your inbox. We sent an email with a URL for changing your password.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to change your GNU MediaGoblin password, open the following URL in \n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you think this is an error, just ignore this email and continue being\n"
+"a happy goblin!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/login.html:29
msgid "Logging in failed!"
msgstr "Авторизация неуспешна!"
@@ -243,6 +309,14 @@ msgstr "Ещё нету аккаунта?"
msgid "Create one here!"
msgstr "Создайте здесь!"
+#: mediagoblin/templates/mediagoblin/auth/login.html:48
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:51
+msgid "Change it!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/register.html:27
msgid "Create an account!"
msgstr "Создать аккаунт!"
@@ -302,7 +376,7 @@ msgstr "Подтвердить"
#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:32
#, python-format
msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
-msgstr ""
+msgstr "Файлы пользователя &lt;a href=\"%(user_url)s\"&gt;%(username)s&lt;/a&gt;"
#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:52
#: mediagoblin/templates/mediagoblin/user_pages/user.html:32
@@ -312,11 +386,11 @@ msgstr "Извините, но такой пользователь не найд
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
msgid "Really delete %(title)s?"
-msgstr ""
+msgstr "Действительно удалить %(title)s?"
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
msgid "Delete Permanently"
-msgstr ""
+msgstr "Удалить безвозвратно"
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
msgid "Media processing panel"
@@ -418,7 +492,7 @@ msgstr "Пока что тут файлов нет…"
#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
msgid "feed icon"
-msgstr ""
+msgstr "значок ленты"
#: mediagoblin/templates/mediagoblin/utils/feed_link.html:23
msgid "Atom feed"
@@ -426,11 +500,11 @@ msgstr "лента в формате Atom"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:40
msgid "Newer"
-msgstr ""
+msgstr "Более новые"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:46
msgid "Older"
-msgstr ""
+msgstr "Более старые"
#: mediagoblin/user_pages/forms.py:24
msgid "Comment"
@@ -438,9 +512,9 @@ msgstr "Комментарий"
#: mediagoblin/user_pages/forms.py:30
msgid "I am sure I want to delete this"
-msgstr ""
+msgstr "Я уверен, что хочу удалить это"
-#: mediagoblin/user_pages/views.py:176
+#: mediagoblin/user_pages/views.py:175
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo
index 663a7e55..d1ce44b2 100644
--- a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo
+++ b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo
Binary files differ
diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po
index 22c80076..17ffeec0 100644
--- a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po
@@ -2,13 +2,14 @@
# Copyright (C) 2011 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
#
+# Translators:
# Jure Repinc <jlp@holodeck1.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2011-09-05 23:31-0500\n"
-"PO-Revision-Date: 2011-09-06 04:31+0000\n"
+"POT-Creation-Date: 2011-09-11 16:16-0500\n"
+"PO-Revision-Date: 2011-09-11 21:16+0000\n"
"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -18,43 +19,43 @@ msgstr ""
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
-#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:48
+#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:49
msgid "Username"
msgstr "Uporabniško ime"
-#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:53
msgid "Password"
msgstr "Geslo"
-#: mediagoblin/auth/forms.py:34
+#: mediagoblin/auth/forms.py:35
msgid "Passwords must match."
msgstr "Gesli morata biti enaki."
-#: mediagoblin/auth/forms.py:36
+#: mediagoblin/auth/forms.py:37
msgid "Confirm password"
msgstr "Potrdite geslo"
-#: mediagoblin/auth/forms.py:38
+#: mediagoblin/auth/forms.py:39
msgid "Type it again here to make sure there are no spelling mistakes."
msgstr ""
-#: mediagoblin/auth/forms.py:41
+#: mediagoblin/auth/forms.py:42
msgid "Email address"
msgstr "E-poštni naslov"
-#: mediagoblin/auth/views.py:40
+#: mediagoblin/auth/views.py:42
msgid "Sorry, registration is disabled on this instance."
msgstr "Oprostite, prijava za ta izvod ni omogočena."
-#: mediagoblin/auth/views.py:58
+#: mediagoblin/auth/views.py:60
msgid "Sorry, a user with that name already exists."
msgstr "Oprostite, uporabnik s tem imenom že obstaja."
-#: mediagoblin/auth/views.py:62
+#: mediagoblin/auth/views.py:64
msgid "Sorry, that email address has already been taken."
msgstr "Oprostite, ta e-poštni naslov je že v uporabi."
-#: mediagoblin/auth/views.py:160
+#: mediagoblin/auth/views.py:165
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
@@ -62,15 +63,20 @@ msgstr ""
"Vaš e-poštni naslov je bil potrjen. Sedaj se lahko prijavite, uredite svoj "
"profil in pošljete slike."
-#: mediagoblin/auth/views.py:166
+#: mediagoblin/auth/views.py:171
msgid "The verification key or user id is incorrect"
msgstr "Potrditveni ključ ali uporabniška identifikacija je napačna"
-#: mediagoblin/auth/views.py:187
-#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22
+#: mediagoblin/auth/views.py:192
msgid "Resent your verification email."
msgstr "Ponovno pošiljanje potrditvene e-pošte."
+#: mediagoblin/auth/views.py:228
+msgid ""
+"Could not send password recovery email as your username is inactive or your "
+"account's email address has not been verified."
+msgstr ""
+
#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27
msgid "Title"
msgstr "Naslov"
@@ -108,7 +114,7 @@ msgstr "Vnos s to oznako za tega uporabnika že obstaja."
msgid "You are editing another user's media. Proceed with caution."
msgstr "Urejate vsebino drugega uporabnika. Nadaljujte pazljivo."
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:154
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Urejate uporabniški profil. Nadaljujte pazljivo."
@@ -184,6 +190,10 @@ msgid ""
"href=\"http://gnu.org/\">GNU</a> project"
msgstr ""
+#: mediagoblin/templates/mediagoblin/root.html:24
+msgid "Explore"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/root.html:27
msgid "Hi there, media lover! MediaGoblin is..."
msgstr "Pozdravljen, ljubitelj večpredstavnostnih vsebin! MediaGoblin je ..."
@@ -232,6 +242,60 @@ msgstr ""
"href=\"http://mediagoblin.org/pages/join.html\">Pri izboljševanju nam lahko "
"pomagate tudi vi.</a>)"
+#: mediagoblin/templates/mediagoblin/root.html:38
+msgid "Excited to join us?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:39
+#, python-format
+msgid ""
+"\n"
+" <a class=\"header_submit_highlight\" href=\"%(register_url)s\">Create a free account</a>\n"
+" or\n"
+" <a class=\"header_submit\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:53
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:27
+msgid "Enter your new password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
+msgid "Enter your username or email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_changed_success.html:22
+msgid ""
+"\n"
+" Your password has been changed. Try to log in now.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_email_sent.html:22
+msgid ""
+"\n"
+" Check your inbox. We sent an email with a URL for changing your password.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to change your GNU MediaGoblin password, open the following URL in \n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you think this is an error, just ignore this email and continue being\n"
+"a happy goblin!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/login.html:29
msgid "Logging in failed!"
msgstr "Prijava ni uspela."
@@ -244,6 +308,14 @@ msgstr "Še nimate računa?"
msgid "Create one here!"
msgstr "Ustvarite si ga."
+#: mediagoblin/templates/mediagoblin/auth/login.html:48
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:51
+msgid "Change it!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/register.html:27
msgid "Create an account!"
msgstr "Ustvarite račun."
@@ -441,7 +513,7 @@ msgstr "Komentar"
msgid "I am sure I want to delete this"
msgstr ""
-#: mediagoblin/user_pages/views.py:176
+#: mediagoblin/user_pages/views.py:175
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
diff --git a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo
index 80608e3a..d09aea44 100644
--- a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo
+++ b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo
Binary files differ
diff --git a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po
index 7a843fdc..da928da6 100644
--- a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po
@@ -2,12 +2,13 @@
# Copyright (C) 2011 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
#
+# Translators:
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2011-09-05 23:31-0500\n"
-"PO-Revision-Date: 2011-09-06 04:31+0000\n"
+"POT-Creation-Date: 2011-09-11 16:16-0500\n"
+"PO-Revision-Date: 2011-09-11 21:16+0000\n"
"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
"Language-Team: Serbian (http://www.transifex.net/projects/p/mediagoblin/team/sr/)\n"
"MIME-Version: 1.0\n"
@@ -17,57 +18,62 @@ msgstr ""
"Language: sr\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:48
+#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:49
msgid "Username"
msgstr ""
-#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:53
msgid "Password"
msgstr ""
-#: mediagoblin/auth/forms.py:34
+#: mediagoblin/auth/forms.py:35
msgid "Passwords must match."
msgstr ""
-#: mediagoblin/auth/forms.py:36
+#: mediagoblin/auth/forms.py:37
msgid "Confirm password"
msgstr ""
-#: mediagoblin/auth/forms.py:38
+#: mediagoblin/auth/forms.py:39
msgid "Type it again here to make sure there are no spelling mistakes."
msgstr ""
-#: mediagoblin/auth/forms.py:41
+#: mediagoblin/auth/forms.py:42
msgid "Email address"
msgstr ""
-#: mediagoblin/auth/views.py:40
+#: mediagoblin/auth/views.py:42
msgid "Sorry, registration is disabled on this instance."
msgstr ""
-#: mediagoblin/auth/views.py:58
+#: mediagoblin/auth/views.py:60
msgid "Sorry, a user with that name already exists."
msgstr ""
-#: mediagoblin/auth/views.py:62
+#: mediagoblin/auth/views.py:64
msgid "Sorry, that email address has already been taken."
msgstr ""
-#: mediagoblin/auth/views.py:160
+#: mediagoblin/auth/views.py:165
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr ""
-#: mediagoblin/auth/views.py:166
+#: mediagoblin/auth/views.py:171
msgid "The verification key or user id is incorrect"
msgstr ""
-#: mediagoblin/auth/views.py:187
-#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22
+#: mediagoblin/auth/views.py:192
msgid "Resent your verification email."
msgstr ""
+#: mediagoblin/auth/views.py:228
+msgid ""
+"Could not send password recovery email as your username is inactive or your "
+"account's email address has not been verified."
+msgstr ""
+
#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27
msgid "Title"
msgstr ""
@@ -105,7 +111,7 @@ msgstr ""
msgid "You are editing another user's media. Proceed with caution."
msgstr ""
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:154
msgid "You are editing a user's profile. Proceed with caution."
msgstr ""
@@ -179,6 +185,10 @@ msgid ""
"href=\"http://gnu.org/\">GNU</a> project"
msgstr ""
+#: mediagoblin/templates/mediagoblin/root.html:24
+msgid "Explore"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/root.html:27
msgid "Hi there, media lover! MediaGoblin is..."
msgstr ""
@@ -218,6 +228,60 @@ msgid ""
" software!</a>)"
msgstr ""
+#: mediagoblin/templates/mediagoblin/root.html:38
+msgid "Excited to join us?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:39
+#, python-format
+msgid ""
+"\n"
+" <a class=\"header_submit_highlight\" href=\"%(register_url)s\">Create a free account</a>\n"
+" or\n"
+" <a class=\"header_submit\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:53
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:27
+msgid "Enter your new password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
+msgid "Enter your username or email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_changed_success.html:22
+msgid ""
+"\n"
+" Your password has been changed. Try to log in now.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_email_sent.html:22
+msgid ""
+"\n"
+" Check your inbox. We sent an email with a URL for changing your password.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to change your GNU MediaGoblin password, open the following URL in \n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you think this is an error, just ignore this email and continue being\n"
+"a happy goblin!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/login.html:29
msgid "Logging in failed!"
msgstr ""
@@ -230,6 +294,14 @@ msgstr ""
msgid "Create one here!"
msgstr ""
+#: mediagoblin/templates/mediagoblin/auth/login.html:48
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:51
+msgid "Change it!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/register.html:27
msgid "Create an account!"
msgstr ""
@@ -417,7 +489,7 @@ msgstr ""
msgid "I am sure I want to delete this"
msgstr ""
-#: mediagoblin/user_pages/views.py:176
+#: mediagoblin/user_pages/views.py:175
msgid "You are about to delete another user's media. Proceed with caution."
msgstr ""
diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo
index 9086472a..5f8ac655 100644
--- a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo
+++ b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo
Binary files differ
diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po
index 78a6bd41..f38166a5 100644
--- a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po
@@ -2,13 +2,14 @@
# Copyright (C) 2011 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
#
+# Translators:
# <transifex@wandborg.se>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2011-09-05 23:31-0500\n"
-"PO-Revision-Date: 2011-09-06 04:31+0000\n"
+"POT-Creation-Date: 2011-09-11 16:16-0500\n"
+"PO-Revision-Date: 2011-09-11 21:16+0000\n"
"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
"Language-Team: Swedish (http://www.transifex.net/projects/p/mediagoblin/team/sv/)\n"
"MIME-Version: 1.0\n"
@@ -18,43 +19,43 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:48
+#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:49
msgid "Username"
msgstr "Användarnamn"
-#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:53
msgid "Password"
msgstr "Lösenord"
-#: mediagoblin/auth/forms.py:34
+#: mediagoblin/auth/forms.py:35
msgid "Passwords must match."
msgstr "Lösenorden måste vara identiska."
-#: mediagoblin/auth/forms.py:36
+#: mediagoblin/auth/forms.py:37
msgid "Confirm password"
msgstr "Bekräfta lösenord"
-#: mediagoblin/auth/forms.py:38
+#: mediagoblin/auth/forms.py:39
msgid "Type it again here to make sure there are no spelling mistakes."
-msgstr ""
+msgstr "Skriv in det igen för att undvika stavfel."
-#: mediagoblin/auth/forms.py:41
+#: mediagoblin/auth/forms.py:42
msgid "Email address"
msgstr "E-postadress"
-#: mediagoblin/auth/views.py:40
+#: mediagoblin/auth/views.py:42
msgid "Sorry, registration is disabled on this instance."
msgstr "Vi beklagar, registreringen är avtängd på den här instansen."
-#: mediagoblin/auth/views.py:58
+#: mediagoblin/auth/views.py:60
msgid "Sorry, a user with that name already exists."
msgstr "En användare med det användarnamnet finns redan."
-#: mediagoblin/auth/views.py:62
+#: mediagoblin/auth/views.py:64
msgid "Sorry, that email address has already been taken."
msgstr "Den e-postadressen är redan tagen."
-#: mediagoblin/auth/views.py:160
+#: mediagoblin/auth/views.py:165
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
@@ -62,15 +63,20 @@ msgstr ""
"Din e-postadress är verifierad. Du kan nu logga in, redigera din profil och "
"ladda upp filer!"
-#: mediagoblin/auth/views.py:166
+#: mediagoblin/auth/views.py:171
msgid "The verification key or user id is incorrect"
msgstr "Verifieringsnyckeln eller användar-IDt är fel."
-#: mediagoblin/auth/views.py:187
-#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22
+#: mediagoblin/auth/views.py:192
msgid "Resent your verification email."
msgstr "Skickade ett nytt verifierings-email."
+#: mediagoblin/auth/views.py:228
+msgid ""
+"Could not send password recovery email as your username is inactive or your "
+"account's email address has not been verified."
+msgstr ""
+
#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27
msgid "Title"
msgstr "Titel"
@@ -90,7 +96,7 @@ msgstr "Sökvägsnamnet kan inte vara tomt"
#: mediagoblin/edit/forms.py:35
msgid ""
"The title part of this media's URL. You usually don't need to change this."
-msgstr ""
+msgstr "Sökvägstitlen för din media. Du brukar inte behöva ändra denna."
#: mediagoblin/edit/forms.py:42
msgid "Bio"
@@ -108,7 +114,7 @@ msgstr "Ett inlägg med det sökvägsnamnet existerar redan."
msgid "You are editing another user's media. Proceed with caution."
msgstr "Var försiktig, du redigerar någon annans inlägg."
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:154
msgid "You are editing a user's profile. Proceed with caution."
msgstr "Var försiktig, du redigerar en annan användares profil."
@@ -122,7 +128,7 @@ msgstr "Fil"
#: mediagoblin/submit/forms.py:30
msgid "Description of this work"
-msgstr ""
+msgstr "Beskrivning av verket"
#: mediagoblin/submit/views.py:47
msgid "You must provide a file."
@@ -183,6 +189,12 @@ msgid ""
"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
"href=\"http://gnu.org/\">GNU</a> project"
msgstr ""
+"Drivs av <a href=\"http://mediagoblin.org\">MediaGoblin</a>, ett <a "
+"href=\"http://gnu.org/\">GNU</a>-projekt"
+
+#: mediagoblin/templates/mediagoblin/root.html:24
+msgid "Explore"
+msgstr ""
#: mediagoblin/templates/mediagoblin/root.html:27
msgid "Hi there, media lover! MediaGoblin is..."
@@ -237,6 +249,60 @@ msgstr ""
"href=\"http://mediagoblin.org/pages/join.html\">Du kan hjälpa os forbättra "
"MediaGoblin!</a>)"
+#: mediagoblin/templates/mediagoblin/root.html:38
+msgid "Excited to join us?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:39
+#, python-format
+msgid ""
+"\n"
+" <a class=\"header_submit_highlight\" href=\"%(register_url)s\">Create a free account</a>\n"
+" or\n"
+" <a class=\"header_submit\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:53
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:27
+msgid "Enter your new password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
+msgid "Enter your username or email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_changed_success.html:22
+msgid ""
+"\n"
+" Your password has been changed. Try to log in now.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_email_sent.html:22
+msgid ""
+"\n"
+" Check your inbox. We sent an email with a URL for changing your password.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to change your GNU MediaGoblin password, open the following URL in \n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you think this is an error, just ignore this email and continue being\n"
+"a happy goblin!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/login.html:29
msgid "Logging in failed!"
msgstr "Inloggning misslyckades!"
@@ -249,6 +315,14 @@ msgstr "Har du inget konto?"
msgid "Create one here!"
msgstr "Skapa ett!"
+#: mediagoblin/templates/mediagoblin/auth/login.html:48
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:51
+msgid "Change it!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/register.html:27
msgid "Create an account!"
msgstr "Skapa ett konto!"
@@ -318,11 +392,11 @@ msgstr "Finns ingen sådan användare ännu."
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
#, python-format
msgid "Really delete %(title)s?"
-msgstr ""
+msgstr "Vill du verkligen radera %(title)s?"
#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
msgid "Delete Permanently"
-msgstr ""
+msgstr "Radera permanent"
#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
msgid "Media processing panel"
@@ -435,11 +509,11 @@ msgstr "Atom-feed"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:40
msgid "Newer"
-msgstr ""
+msgstr "Nyare"
#: mediagoblin/templates/mediagoblin/utils/pagination.html:46
msgid "Older"
-msgstr ""
+msgstr "Äldre"
#: mediagoblin/user_pages/forms.py:24
msgid "Comment"
@@ -447,10 +521,10 @@ msgstr "Kommentar"
#: mediagoblin/user_pages/forms.py:30
msgid "I am sure I want to delete this"
-msgstr ""
+msgstr "Jag är säker på att jag vill radera detta"
-#: mediagoblin/user_pages/views.py:176
+#: mediagoblin/user_pages/views.py:175
msgid "You are about to delete another user's media. Proceed with caution."
-msgstr ""
+msgstr "Du tänker radera en annan användares media. Var försiktig."
diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo
index dc196210..e0117391 100644
--- a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo
+++ b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo
Binary files differ
diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po
index 8a5fc21c..9e4380c2 100644
--- a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po
@@ -2,14 +2,15 @@
# Copyright (C) 2011 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
#
+# Translators:
# <chc@citi.sinica.edu.tw>, 2011.
# Harry Chen <harryhow@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2011-09-05 23:31-0500\n"
-"PO-Revision-Date: 2011-09-06 04:31+0000\n"
+"POT-Creation-Date: 2011-09-11 16:16-0500\n"
+"PO-Revision-Date: 2011-09-11 21:16+0000\n"
"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -19,57 +20,62 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:48
+#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:49
msgid "Username"
msgstr "使用者名稱"
-#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:52
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:53
msgid "Password"
msgstr "密碼"
-#: mediagoblin/auth/forms.py:34
+#: mediagoblin/auth/forms.py:35
msgid "Passwords must match."
msgstr "密碼必須一致"
-#: mediagoblin/auth/forms.py:36
+#: mediagoblin/auth/forms.py:37
msgid "Confirm password"
msgstr "確認密碼"
-#: mediagoblin/auth/forms.py:38
+#: mediagoblin/auth/forms.py:39
msgid "Type it again here to make sure there are no spelling mistakes."
msgstr "再輸入一次,確定你沒有打錯字。"
-#: mediagoblin/auth/forms.py:41
+#: mediagoblin/auth/forms.py:42
msgid "Email address"
msgstr "電子郵件位置"
-#: mediagoblin/auth/views.py:40
+#: mediagoblin/auth/views.py:42
msgid "Sorry, registration is disabled on this instance."
msgstr "抱歉, 這個項目已經被暫停註冊."
-#: mediagoblin/auth/views.py:58
+#: mediagoblin/auth/views.py:60
msgid "Sorry, a user with that name already exists."
msgstr "抱歉, 這個使用者名稱已經存在."
-#: mediagoblin/auth/views.py:62
+#: mediagoblin/auth/views.py:64
msgid "Sorry, that email address has already been taken."
msgstr "抱歉,這個電子郵件已經被其他人使用了。"
-#: mediagoblin/auth/views.py:160
+#: mediagoblin/auth/views.py:165
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr "你的電子郵件位址已被認證. 你現在就可以登入, 編輯你的個人檔案而且遞交照片!"
-#: mediagoblin/auth/views.py:166
+#: mediagoblin/auth/views.py:171
msgid "The verification key or user id is incorrect"
msgstr "認證碼或是使用者帳號錯誤"
-#: mediagoblin/auth/views.py:187
-#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22
+#: mediagoblin/auth/views.py:192
msgid "Resent your verification email."
msgstr "重送認證信."
+#: mediagoblin/auth/views.py:228
+msgid ""
+"Could not send password recovery email as your username is inactive or your "
+"account's email address has not been verified."
+msgstr ""
+
#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27
msgid "Title"
msgstr "標題"
@@ -107,7 +113,7 @@ msgstr "這個自訂字串已經被其他人用了"
msgid "You are editing another user's media. Proceed with caution."
msgstr "你正在編輯他人的媒體檔案. 請謹慎處理."
-#: mediagoblin/edit/views.py:155
+#: mediagoblin/edit/views.py:154
msgid "You are editing a user's profile. Proceed with caution."
msgstr "你正在編輯一位用戶的檔案. 請謹慎處理."
@@ -183,6 +189,10 @@ msgstr ""
"由 <a href=\"http://mediagoblin.org\">MediaGoblin</a>製作, 它是一個 <a "
"href=\"http://gnu.org/\">GNU</a> 專案"
+#: mediagoblin/templates/mediagoblin/root.html:24
+msgid "Explore"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/root.html:27
msgid "Hi there, media lover! MediaGoblin is..."
msgstr "嗨!多媒體檔案愛好者!MediaGoblin是..."
@@ -224,6 +234,60 @@ msgstr ""
"由像你一樣的人們製作 (<a "
"href=\"http://mediagoblin.org/pages/join.html\">你可以幫我們改進軟體!</a>)"
+#: mediagoblin/templates/mediagoblin/root.html:38
+msgid "Excited to join us?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:39
+#, python-format
+msgid ""
+"\n"
+" <a class=\"header_submit_highlight\" href=\"%(register_url)s\">Create a free account</a>\n"
+" or\n"
+" <a class=\"header_submit\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:53
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:27
+msgid "Enter your new password"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
+msgid "Enter your username or email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_changed_success.html:22
+msgid ""
+"\n"
+" Your password has been changed. Try to log in now.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_email_sent.html:22
+msgid ""
+"\n"
+" Check your inbox. We sent an email with a URL for changing your password.\n"
+" "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to change your GNU MediaGoblin password, open the following URL in \n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you think this is an error, just ignore this email and continue being\n"
+"a happy goblin!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/login.html:29
msgid "Logging in failed!"
msgstr "登入失敗!"
@@ -236,6 +300,14 @@ msgstr "還沒有帳號嗎?"
msgid "Create one here!"
msgstr "在這裡建立一個吧!"
+#: mediagoblin/templates/mediagoblin/auth/login.html:48
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:51
+msgid "Change it!"
+msgstr ""
+
#: mediagoblin/templates/mediagoblin/auth/register.html:27
msgid "Create an account!"
msgstr "建立一個帳號!"
@@ -428,7 +500,7 @@ msgstr "評論"
msgid "I am sure I want to delete this"
msgstr ""
-#: mediagoblin/user_pages/views.py:176
+#: mediagoblin/user_pages/views.py:175
msgid "You are about to delete another user's media. Proceed with caution."
msgstr "你在刪除其他人的媒體檔案。請小心處理喔。"
diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html
index ed4878a5..854fca51 100644
--- a/mediagoblin/templates/mediagoblin/root.html
+++ b/mediagoblin/templates/mediagoblin/root.html
@@ -21,7 +21,7 @@
{% block mediagoblin_content %}
{% if request.user %}
- <h1>Explore</h1>
+ <h1>{% trans %}Explore{% endtrans %}</h1>
{% else %}
<div class="grid_11 alpha">
<h1>{% trans %}Hi there, media lover! MediaGoblin is...{% endtrans %}</h1>
@@ -35,9 +35,12 @@
</ul>
{% if allow_registration %}
- <p>Excited to join us?<p>
- <a class="header_submit_highlight" href="{{ request.urlgen('mediagoblin.auth.register') }}">Create a free account</a> or
- <a class="header_submit" href="http://wiki.mediagoblin.org/HackingHowto">Set up MediaGoblin on your own server</a>
+ <p>{% trans %}Excited to join us?{% endtrans %}<p>
+ {% trans register_url=request.urlgen('mediagoblin.auth.register') %}
+ <a class="header_submit_highlight" href="{{ register_url }}">Create a free account</a>
+ or
+ <a class="header_submit" href="http://wiki.mediagoblin.org/HackingHowto">Set up MediaGoblin on your own server</a>
+ {% endtrans %}
{% endif %}
</div>
@@ -47,6 +50,6 @@
<div class="clear"></div>
{% endif %}
- <h2>Most recent media</h2>
+ <h2>{% trans %}Most recent media{% endtrans %}</h2>
{{ object_gallery(request, media_entries, pagination) }}
{% endblock %}