diff options
47 files changed, 1160 insertions, 442 deletions
diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py index 4c4a34fd..48c5937c 100644 --- a/mediagoblin/auth/views.py +++ b/mediagoblin/auth/views.py @@ -44,11 +44,12 @@ def register(request): if request.method == 'POST' and register_form.validate(): # TODO: Make sure the user doesn't exist already - + username = unicode(request.POST['username'].lower()) + email = unicode(request.POST['email'].lower()) users_with_username = request.db.User.find( - {'username': request.POST['username'].lower()}).count() + {'username': username}).count() users_with_email = request.db.User.find( - {'email': request.POST['email'].lower()}).count() + {'email': email}).count() extra_validation_passes = True @@ -64,8 +65,8 @@ def register(request): if extra_validation_passes: # Create the user user = request.db.User() - user['username'] = request.POST['username'].lower() - user['email'] = request.POST['email'].lower() + user['username'] = username + user['email'] = email user['pw_hash'] = auth_lib.bcrypt_gen_password_hash( request.POST['password']) user.save(validate=True) diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py index c66049ca..f1b5d229 100644 --- a/mediagoblin/decorators.py +++ b/mediagoblin/decorators.py @@ -52,6 +52,22 @@ def require_active_login(controller): return _make_safe(new_controller_func, controller) +def user_may_delete_media(controller): + """ + Require user ownership of the MediaEntry to delete. + """ + def wrapper(request, *args, **kwargs): + uploader = request.db.MediaEntry.find_one( + {'_id': ObjectId(request.matchdict['media'])}).uploader() + if not (request.user['is_admin'] or + request.user['_id'] == uploader['_id']): + return exc.HTTPForbidden() + + return controller(request, *args, **kwargs) + + return _make_safe(wrapper, controller) + + def uses_pagination(controller): """ Check request GET 'page' key for wrong values @@ -122,3 +138,4 @@ def get_media_entry_by_id(controller): return controller(request, media=media, *args, **kwargs) return _make_safe(wrapper, controller) + diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index b0145a04..f766afdc 100644 --- a/mediagoblin/edit/views.py +++ b/mediagoblin/edit/views.py @@ -14,6 +14,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +import uuid from webob import exc from string import split @@ -64,8 +65,8 @@ def edit_media(request, media): form.slug.errors.append( _(u'An entry with that slug already exists for this user.')) else: - media['title'] = request.POST['title'] - media['description'] = request.POST.get('description') + media['title'] = unicode(request.POST['title']) + media['description'] = unicode(request.POST.get('description')) media['tags'] = convert_to_tag_list_of_dicts( request.POST.get('tags')) @@ -80,7 +81,7 @@ def edit_media(request, media): and 'y' == request.POST['attachment_delete']: del media['attachment_files'][0] - media['slug'] = request.POST['slug'] + media['slug'] = unicode(request.POST['slug']) media.save() return redirect(request, "mediagoblin.user_pages.media_home", @@ -171,8 +172,8 @@ def edit_profile(request): bio=user.get('bio')) if request.method == 'POST' and form.validate(): - user['url'] = request.POST['url'] - user['bio'] = request.POST['bio'] + user['url'] = unicode(request.POST['url']) + user['bio'] = unicode(request.POST['bio']) user['bio_html'] = cleaned_markdown_conversion(user['bio']) diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo Binary files differindex aa0cd03b..dafcdb66 100644 --- a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po index 201f2611..df47bac4 100644 --- a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n" -"POT-Creation-Date: 2011-08-25 07:41-0500\n" -"PO-Revision-Date: 2011-08-25 12:41+0000\n" +"POT-Creation-Date: 2011-08-30 22:51-0500\n" +"PO-Revision-Date: 2011-08-31 03:51+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -20,50 +20,66 @@ 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:46 +#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:54 msgid "Username" msgstr "اسم المستخدم" -#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50 +#: mediagoblin/auth/forms.py:28 +msgid "This is the name other users will identify you with." +msgstr "" + +#: mediagoblin/auth/forms.py:31 mediagoblin/auth/forms.py:58 msgid "Password" msgstr "كلمة المرور" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:36 msgid "Passwords must match." msgstr "يجب أن تتطابق كلمتا المرور." -#: mediagoblin/auth/forms.py:36 +#: mediagoblin/auth/forms.py:37 +msgid "Try to use a strong password!" +msgstr "" + +#: mediagoblin/auth/forms.py:40 msgid "Confirm password" msgstr "تأكيد كلمة المرور" -#: mediagoblin/auth/forms.py:39 +#: mediagoblin/auth/forms.py:42 +msgid "Type it again here to make sure there are no spelling mistakes." +msgstr "" + +#: mediagoblin/auth/forms.py:45 msgid "Email address" msgstr "عنوان البريد الإلكتروني" +#: mediagoblin/auth/forms.py:48 +msgid "Your email will never be published." +msgstr "" + #: mediagoblin/auth/views.py:40 msgid "Sorry, registration is disabled on this instance." msgstr "عفوًا، التسجيل غير متاح هنا." -#: mediagoblin/auth/views.py:57 +#: mediagoblin/auth/views.py:58 msgid "Sorry, a user with that name already exists." msgstr "عذرا، مستخدم بهذا الاسم موجود فعلا." -#: mediagoblin/auth/views.py:61 +#: mediagoblin/auth/views.py:62 msgid "Sorry, that email address has already been taken." msgstr "عفوًا، هذا العنوان البريدي مستخدم." -#: mediagoblin/auth/views.py:159 +#: mediagoblin/auth/views.py:160 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "" "تم التحقق من بريدك الإلكتروني. يمكنك الآن الولوج، تحرير ملفك، وإرسال الصور!" -#: mediagoblin/auth/views.py:165 +#: mediagoblin/auth/views.py:166 msgid "The verification key or user id is incorrect" msgstr "مفتاح التحقق أو معرف المستخدم خاطئ" -#: mediagoblin/auth/views.py:186 +#: mediagoblin/auth/views.py:187 #: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22 msgid "Resent your verification email." msgstr "أعيد إرسال رسالة التحقق." @@ -92,15 +108,15 @@ msgstr "السيرة" msgid "Website" msgstr "الموقع الإلكتروني" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:94 +#: mediagoblin/edit/views.py:95 msgid "You are editing another user's media. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:165 +#: mediagoblin/edit/views.py:166 msgid "You are editing a user's profile. Proceed with caution." msgstr "" @@ -167,10 +183,8 @@ msgstr "لُج" #: mediagoblin/templates/mediagoblin/base.html:89 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU project</a>" +"href=\"http://gnu.org/\">GNU</a> project" msgstr "" -"مدعوم بواسطة <a href=\"http://mediagoblin.org\">ميدياغوبلن</a>، <a " -"href=\"http://gnu.org/\">مشروع غنو</a>" #: mediagoblin/templates/mediagoblin/root.html:27 msgid "Hi there, media lover! MediaGoblin is..." @@ -259,6 +273,7 @@ msgstr "ألغِ" #: mediagoblin/templates/mediagoblin/edit/edit.html:37 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:44 msgid "Save changes" msgstr "احفظ التغييرات" @@ -289,6 +304,17 @@ msgstr "وسائط <a href=\"%(user_url)s\">%(username)s</a>" msgid "Sorry, no such user found." msgstr "عذرا، لا يوجد مستخدم مماثل" +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 +#, python-format +msgid "Really delete %(title)s?" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:36 +msgid "" +"If you choose yes, the media entry will be deleted " +"<strong>permanently.</strong>" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22 msgid "Media processing panel" msgstr "لوحة معالجة الوسائط" @@ -396,4 +422,8 @@ msgstr "" msgid "Comment" msgstr "" +#: mediagoblin/user_pages/views.py:176 +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 Binary files differindex 898d5f0f..848ea148 100644 --- a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po index f8ee1ea8..22836525 100644 --- a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n" -"POT-Creation-Date: 2011-08-25 07:41-0500\n" -"PO-Revision-Date: 2011-08-25 19:13+0000\n" -"Last-Translator: piratenpanda <benjamin@lebsanft.org>\n" +"POT-Creation-Date: 2011-08-30 22:51-0500\n" +"PO-Revision-Date: 2011-08-31 03:51+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,39 +23,55 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:46 +#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:54 msgid "Username" msgstr "Benutzername" -#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50 +#: mediagoblin/auth/forms.py:28 +msgid "This is the name other users will identify you with." +msgstr "" + +#: mediagoblin/auth/forms.py:31 mediagoblin/auth/forms.py:58 msgid "Password" msgstr "Passwort" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:36 msgid "Passwords must match." msgstr "Passwörter müssen übereinstimmen." -#: mediagoblin/auth/forms.py:36 +#: mediagoblin/auth/forms.py:37 +msgid "Try to use a strong password!" +msgstr "" + +#: mediagoblin/auth/forms.py:40 msgid "Confirm password" msgstr "Passwort wiederholen" -#: mediagoblin/auth/forms.py:39 +#: mediagoblin/auth/forms.py:42 +msgid "Type it again here to make sure there are no spelling mistakes." +msgstr "" + +#: mediagoblin/auth/forms.py:45 msgid "Email address" msgstr "Email-Adresse" +#: mediagoblin/auth/forms.py:48 +msgid "Your email will never be published." +msgstr "" + #: mediagoblin/auth/views.py:40 msgid "Sorry, registration is disabled on this instance." msgstr "Registrierung ist auf dieser Instanz leider deaktiviert." -#: mediagoblin/auth/views.py:57 +#: mediagoblin/auth/views.py:58 msgid "Sorry, a user with that name already exists." msgstr "Leider gibt es bereits einen Benutzer mit diesem Namen." -#: mediagoblin/auth/views.py:61 +#: mediagoblin/auth/views.py:62 msgid "Sorry, that email address has already been taken." msgstr "Tut und Leid, aber diese Email-Adresse wird bereits verwendet." -#: mediagoblin/auth/views.py:159 +#: mediagoblin/auth/views.py:160 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" @@ -63,11 +79,11 @@ msgstr "" "Deine Email-Adresse wurde bestätigt. Du kannst dich nun anmelden, Dein " "Profil bearbeiten und Bilder hochladen!" -#: mediagoblin/auth/views.py:165 +#: mediagoblin/auth/views.py:166 msgid "The verification key or user id is incorrect" msgstr "Der Bestätigungssschlüssel oder die Nutzernummer ist falsch." -#: mediagoblin/auth/views.py:186 +#: mediagoblin/auth/views.py:187 #: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22 msgid "Resent your verification email." msgstr "Bestätigungs-Email wurde erneut versandt." @@ -96,15 +112,15 @@ msgstr "Biographie" msgid "Website" msgstr "Webseite" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "Diesen Kurztitel hast du bereits vergeben." -#: mediagoblin/edit/views.py:94 +#: mediagoblin/edit/views.py:95 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:165 +#: mediagoblin/edit/views.py:166 msgid "You are editing a user's profile. Proceed with caution." msgstr "Du bearbeitest das Profil eines Anderen. Bitte sei vorsichtig." @@ -173,10 +189,8 @@ msgstr "Anmelden" #: mediagoblin/templates/mediagoblin/base.html:89 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU project</a>" +"href=\"http://gnu.org/\">GNU</a> project" msgstr "" -"Läuft mit <a href=\"http://mediagoblin.org\">MediaGoblin</a>, einem <a " -"href=\"http://gnu.org/\">GNU-Projekt</a>" #: mediagoblin/templates/mediagoblin/root.html:27 msgid "Hi there, media lover! MediaGoblin is..." @@ -275,6 +289,7 @@ msgstr "Abbrechen" #: mediagoblin/templates/mediagoblin/edit/edit.html:37 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:44 msgid "Save changes" msgstr "Änderungen speichern" @@ -305,6 +320,17 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a>s Medien" msgid "Sorry, no such user found." msgstr "Dieser Benutzer wurde leider nicht gefunden." +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 +#, python-format +msgid "Really delete %(title)s?" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:36 +msgid "" +"If you choose yes, the media entry will be deleted " +"<strong>permanently.</strong>" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22 msgid "Media processing panel" msgstr "Medienverarbeitung" @@ -419,4 +445,8 @@ msgstr "Atom-Feed" msgid "Comment" msgstr "Kommentar" +#: mediagoblin/user_pages/views.py:176 +msgid "You are about to delete another user's media. Proceed with caution." +msgstr "" + diff --git a/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po index 3f5539c6..f9022543 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-08-25 07:41-0500\n" +"POT-Creation-Date: 2011-08-30 22:51-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,49 +17,65 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:46 +#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:54 msgid "Username" msgstr "" -#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50 +#: mediagoblin/auth/forms.py:28 +msgid "This is the name other users will identify you with." +msgstr "" + +#: mediagoblin/auth/forms.py:31 mediagoblin/auth/forms.py:58 msgid "Password" msgstr "" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:36 msgid "Passwords must match." msgstr "" -#: mediagoblin/auth/forms.py:36 +#: mediagoblin/auth/forms.py:37 +msgid "Try to use a strong password!" +msgstr "" + +#: mediagoblin/auth/forms.py:40 msgid "Confirm password" msgstr "" -#: mediagoblin/auth/forms.py:39 +#: mediagoblin/auth/forms.py:42 +msgid "Type it again here to make sure there are no spelling mistakes." +msgstr "" + +#: mediagoblin/auth/forms.py:45 msgid "Email address" msgstr "" +#: mediagoblin/auth/forms.py:48 +msgid "Your email will never be published." +msgstr "" + #: mediagoblin/auth/views.py:40 msgid "Sorry, registration is disabled on this instance." msgstr "" -#: mediagoblin/auth/views.py:57 +#: mediagoblin/auth/views.py:58 msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/views.py:61 +#: mediagoblin/auth/views.py:62 msgid "Sorry, that email address has already been taken." msgstr "" -#: mediagoblin/auth/views.py:159 +#: mediagoblin/auth/views.py:160 msgid "" "Your email address has been verified. You may now login, edit your " "profile, and submit images!" msgstr "" -#: mediagoblin/auth/views.py:165 +#: mediagoblin/auth/views.py:166 msgid "The verification key or user id is incorrect" msgstr "" -#: mediagoblin/auth/views.py:186 +#: mediagoblin/auth/views.py:187 #: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22 msgid "Resent your verification email." msgstr "" @@ -88,15 +104,15 @@ msgstr "" msgid "Website" msgstr "" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:94 +#: mediagoblin/edit/views.py:95 msgid "You are editing another user's media. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:165 +#: mediagoblin/edit/views.py:166 msgid "You are editing a user's profile. Proceed with caution." msgstr "" @@ -163,7 +179,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/base.html:89 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU project</a>" +"href=\"http://gnu.org/\">GNU</a> project" msgstr "" #: mediagoblin/templates/mediagoblin/root.html:27 @@ -247,6 +263,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit.html:37 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:44 msgid "Save changes" msgstr "" @@ -277,6 +294,17 @@ msgstr "" msgid "Sorry, no such user found." msgstr "" +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 +#, python-format +msgid "Really delete %(title)s?" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:36 +msgid "" +"If you choose yes, the media entry will be deleted " +"<strong>permanently.</strong>" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22 msgid "Media processing panel" msgstr "" @@ -380,3 +408,7 @@ msgstr "" msgid "Comment" msgstr "" +#: mediagoblin/user_pages/views.py:176 +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 Binary files differindex 63a3294f..4fb13eef 100644 --- a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po index f2a1b78b..c4a286e2 100644 --- a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n" -"POT-Creation-Date: 2011-08-25 07:41-0500\n" -"PO-Revision-Date: 2011-08-25 14:28+0000\n" -"Last-Translator: aleksejrs <deletesoftware@yandex.ru>\n" +"POT-Creation-Date: 2011-08-30 22:51-0500\n" +"PO-Revision-Date: 2011-08-31 03:51+0000\n" +"Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,39 +20,55 @@ msgstr "" "Language: eo\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:46 +#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:54 msgid "Username" msgstr "Uzantnomo" -#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50 +#: mediagoblin/auth/forms.py:28 +msgid "This is the name other users will identify you with." +msgstr "" + +#: mediagoblin/auth/forms.py:31 mediagoblin/auth/forms.py:58 msgid "Password" msgstr "Pasvorto" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:36 msgid "Passwords must match." msgstr "Pasvortoj devas esti egalaj." -#: mediagoblin/auth/forms.py:36 +#: mediagoblin/auth/forms.py:37 +msgid "Try to use a strong password!" +msgstr "" + +#: mediagoblin/auth/forms.py:40 msgid "Confirm password" msgstr "Retajpu pasvorton" -#: mediagoblin/auth/forms.py:39 +#: mediagoblin/auth/forms.py:42 +msgid "Type it again here to make sure there are no spelling mistakes." +msgstr "" + +#: mediagoblin/auth/forms.py:45 msgid "Email address" msgstr "Retpoŝtadreso" +#: mediagoblin/auth/forms.py:48 +msgid "Your email will never be published." +msgstr "" + #: mediagoblin/auth/views.py:40 msgid "Sorry, registration is disabled on this instance." msgstr "Bedaŭrinde, registrado estas malaktivigita en tiu ĉi instalaĵo." -#: mediagoblin/auth/views.py:57 +#: mediagoblin/auth/views.py:58 msgid "Sorry, a user with that name already exists." msgstr "Bedaŭrinde, uzanto kun tiu nomo jam ekzistas." -#: mediagoblin/auth/views.py:61 +#: mediagoblin/auth/views.py:62 msgid "Sorry, that email address has already been taken." msgstr "Tiu retpoŝtadreso jam estas uzata." -#: mediagoblin/auth/views.py:159 +#: mediagoblin/auth/views.py:160 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" @@ -60,11 +76,11 @@ msgstr "" "Via retpoŝtadreso estas konfirmita. Vi povas nun ensaluti, redakti vian " "profilon, kaj alŝuti bildojn!" -#: mediagoblin/auth/views.py:165 +#: mediagoblin/auth/views.py:166 msgid "The verification key or user id is incorrect" msgstr "La kontrol-kodo aŭ la uzantonomo ne estas korekta" -#: mediagoblin/auth/views.py:186 +#: mediagoblin/auth/views.py:187 #: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22 msgid "Resent your verification email." msgstr "Resendi vian kontrol-mesaĝon." @@ -93,15 +109,15 @@ msgstr "Bio" msgid "Website" msgstr "Retejo" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "Ĉi tiu uzanto jam havas dosieron kun tiu distingiga adresparto." -#: mediagoblin/edit/views.py:94 +#: mediagoblin/edit/views.py:95 msgid "You are editing another user's media. Proceed with caution." msgstr "Vi priredaktas dosieron de alia uzanto. Agu singardeme." -#: mediagoblin/edit/views.py:165 +#: mediagoblin/edit/views.py:166 msgid "You are editing a user's profile. Proceed with caution." msgstr "Vi redaktas profilon de alia uzanto. Agu singardeme." @@ -170,10 +186,8 @@ msgstr "Ensaluti" #: mediagoblin/templates/mediagoblin/base.html:89 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU project</a>" +"href=\"http://gnu.org/\">GNU</a> project" msgstr "" -"Funkcias per <a href=\"http://mediagoblin.org\">MediaGoblin</a>, unu el la " -"<a href=\"http://gnu.org/\">projektoj de GNU</a>" #: mediagoblin/templates/mediagoblin/root.html:27 msgid "Hi there, media lover! MediaGoblin is..." @@ -263,6 +277,7 @@ msgstr "Nuligi" #: mediagoblin/templates/mediagoblin/edit/edit.html:37 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:44 msgid "Save changes" msgstr "Konservi ŝanĝojn" @@ -293,6 +308,17 @@ msgstr "Dosieroj de <a href=\"%(user_url)s\">%(username)s</a>" msgid "Sorry, no such user found." msgstr "Uzanto ne trovita." +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 +#, python-format +msgid "Really delete %(title)s?" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:36 +msgid "" +"If you choose yes, the media entry will be deleted " +"<strong>permanently.</strong>" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22 msgid "Media processing panel" msgstr "" @@ -401,4 +427,8 @@ msgstr "" msgid "Comment" msgstr "Komento" +#: mediagoblin/user_pages/views.py:176 +msgid "You are about to delete another user's media. Proceed with caution." +msgstr "" + diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo Binary files differindex 6adf5526..58531d96 100644 --- a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po index d2e8f662..cfe19a1e 100644 --- a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n" -"POT-Creation-Date: 2011-08-25 07:41-0500\n" -"PO-Revision-Date: 2011-08-25 20:22+0000\n" -"Last-Translator: nvjacobo <jacobo@gnu.org>\n" +"POT-Creation-Date: 2011-08-30 22:51-0500\n" +"PO-Revision-Date: 2011-08-31 03:51+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,39 +20,55 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:46 +#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:54 msgid "Username" msgstr "Nombre de Usuario" -#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50 +#: mediagoblin/auth/forms.py:28 +msgid "This is the name other users will identify you with." +msgstr "" + +#: mediagoblin/auth/forms.py:31 mediagoblin/auth/forms.py:58 msgid "Password" msgstr "Contraseña" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:36 msgid "Passwords must match." msgstr "Las contraseñas deben coincidir." -#: mediagoblin/auth/forms.py:36 +#: mediagoblin/auth/forms.py:37 +msgid "Try to use a strong password!" +msgstr "" + +#: mediagoblin/auth/forms.py:40 msgid "Confirm password" msgstr "Confirme su contraseña" -#: mediagoblin/auth/forms.py:39 +#: mediagoblin/auth/forms.py:42 +msgid "Type it again here to make sure there are no spelling mistakes." +msgstr "" + +#: mediagoblin/auth/forms.py:45 msgid "Email address" msgstr "Dirección de correo electrónico" +#: mediagoblin/auth/forms.py:48 +msgid "Your email will never be published." +msgstr "" + #: mediagoblin/auth/views.py:40 msgid "Sorry, registration is disabled on this instance." msgstr "Lo sentimos, la registración está deshabilitado en este momento." -#: mediagoblin/auth/views.py:57 +#: mediagoblin/auth/views.py:58 msgid "Sorry, a user with that name already exists." msgstr "Lo sentimos, ya existe un usuario con ese nombre." -#: mediagoblin/auth/views.py:61 +#: mediagoblin/auth/views.py:62 msgid "Sorry, that email address has already been taken." msgstr "Lo sentimos, su dirección de correo electrónico ya ha sido tomada." -#: mediagoblin/auth/views.py:159 +#: mediagoblin/auth/views.py:160 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" @@ -60,12 +76,12 @@ msgstr "" "Su dirección de correo electrónico ha sido verificada. ¡Ahora puede " "ingresar, editar su perfil, y enviar imágenes!" -#: mediagoblin/auth/views.py:165 +#: mediagoblin/auth/views.py:166 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:186 +#: mediagoblin/auth/views.py:187 #: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22 msgid "Resent your verification email." msgstr "Reenvíe su correo electrónico de verificación." @@ -94,16 +110,16 @@ msgstr "Bio" msgid "Website" msgstr "Sitio web" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "Una entrada con esa ficha ya existe para este usuario." -#: mediagoblin/edit/views.py:94 +#: mediagoblin/edit/views.py:95 msgid "You are editing another user's media. Proceed with caution." msgstr "" "Usted está editando el contenido de otro usuario. Proceder con precaución." -#: mediagoblin/edit/views.py:165 +#: mediagoblin/edit/views.py:166 msgid "You are editing a user's profile. Proceed with caution." msgstr "Usted está editando un perfil de usuario. Proceder con precaución." @@ -172,10 +188,8 @@ msgstr "Conectarse" #: mediagoblin/templates/mediagoblin/base.html:89 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU project</a>" +"href=\"http://gnu.org/\">GNU</a> project" msgstr "" -"Potenciado por <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU project</a>" #: mediagoblin/templates/mediagoblin/root.html:27 msgid "Hi there, media lover! MediaGoblin is..." @@ -270,6 +284,7 @@ msgstr "Cancelar" #: mediagoblin/templates/mediagoblin/edit/edit.html:37 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:44 msgid "Save changes" msgstr "Salvar cambios" @@ -300,6 +315,17 @@ msgstr "Contenido de <a href=\"%(user_url)s\">%(username)s</a>'s" msgid "Sorry, no such user found." msgstr "Lo sentimos, no se ha encontrado ese usuario." +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 +#, python-format +msgid "Really delete %(title)s?" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:36 +msgid "" +"If you choose yes, the media entry will be deleted " +"<strong>permanently.</strong>" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22 msgid "Media processing panel" msgstr "Panel de procesamiento de contenido" @@ -415,4 +441,8 @@ msgstr "Atom feed" msgid "Comment" msgstr "Comentario" +#: mediagoblin/user_pages/views.py:176 +msgid "You are about to delete another user's media. Proceed with caution." +msgstr "" + diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo Binary files differindex 871d2a42..fe006cdc 100644 --- a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po index 91da5fc7..a3b0eb53 100644 --- a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n" -"POT-Creation-Date: 2011-08-25 07:41-0500\n" -"PO-Revision-Date: 2011-08-25 12:41+0000\n" +"POT-Creation-Date: 2011-08-30 22:51-0500\n" +"PO-Revision-Date: 2011-08-31 03:51+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -21,39 +21,55 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:46 +#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:54 msgid "Username" msgstr "Nom d'utilisateur" -#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50 +#: mediagoblin/auth/forms.py:28 +msgid "This is the name other users will identify you with." +msgstr "" + +#: mediagoblin/auth/forms.py:31 mediagoblin/auth/forms.py:58 msgid "Password" msgstr "Mot de passe" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:36 msgid "Passwords must match." msgstr "Les mots de passe doivent correspondre." -#: mediagoblin/auth/forms.py:36 +#: mediagoblin/auth/forms.py:37 +msgid "Try to use a strong password!" +msgstr "" + +#: mediagoblin/auth/forms.py:40 msgid "Confirm password" msgstr "Confirmer le mot de passe" -#: mediagoblin/auth/forms.py:39 +#: mediagoblin/auth/forms.py:42 +msgid "Type it again here to make sure there are no spelling mistakes." +msgstr "" + +#: mediagoblin/auth/forms.py:45 msgid "Email address" msgstr "Adresse e-mail" +#: mediagoblin/auth/forms.py:48 +msgid "Your email will never be published." +msgstr "" + #: mediagoblin/auth/views.py:40 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:57 +#: mediagoblin/auth/views.py:58 msgid "Sorry, a user with that name already exists." msgstr "Un utilisateur existe déjà avec ce nom, désolé." -#: mediagoblin/auth/views.py:61 +#: mediagoblin/auth/views.py:62 msgid "Sorry, that email address has already been taken." msgstr "Désolé, cette adresse courriel a déjà été prise." -#: mediagoblin/auth/views.py:159 +#: mediagoblin/auth/views.py:160 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" @@ -61,11 +77,11 @@ 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:165 +#: mediagoblin/auth/views.py:166 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:186 +#: mediagoblin/auth/views.py:187 #: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22 msgid "Resent your verification email." msgstr "E-mail de vérification renvoyé." @@ -94,17 +110,17 @@ msgstr "Bio" msgid "Website" msgstr "Site web" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "Une entrée existe déjà pour cet utilisateur avec la même légende." -#: mediagoblin/edit/views.py:94 +#: mediagoblin/edit/views.py:95 msgid "You are editing another user's media. Proceed with caution." msgstr "" "Vous vous apprêtez à modifier le média d'un autre utilisateur. Veuillez " "prendre garde." -#: mediagoblin/edit/views.py:165 +#: mediagoblin/edit/views.py:166 msgid "You are editing a user's profile. Proceed with caution." msgstr "" "Vous vous apprêtez à modifier le profil d'un utilisateur. Veuillez prendre " @@ -173,10 +189,8 @@ msgstr "S'identifier" #: mediagoblin/templates/mediagoblin/base.html:89 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU project</a>" +"href=\"http://gnu.org/\">GNU</a> project" msgstr "" -"Propulsé par <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un projet " -"de <a href=\"http://gnu.org/\">GNU</a>" #: mediagoblin/templates/mediagoblin/root.html:27 msgid "Hi there, media lover! MediaGoblin is..." @@ -264,6 +278,7 @@ msgstr "Annuler" #: mediagoblin/templates/mediagoblin/edit/edit.html:37 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:44 msgid "Save changes" msgstr "Enregistrer les modifications" @@ -294,6 +309,17 @@ msgstr "Médias de <a href=\"%(user_url)s\">%(username)s</a>" msgid "Sorry, no such user found." msgstr "Impossible de trouver cet utilisateur, désolé." +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 +#, python-format +msgid "Really delete %(title)s?" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:36 +msgid "" +"If you choose yes, the media entry will be deleted " +"<strong>permanently.</strong>" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22 msgid "Media processing panel" msgstr "" @@ -404,4 +430,8 @@ msgstr "" msgid "Comment" msgstr "Commentaire" +#: mediagoblin/user_pages/views.py:176 +msgid "You are about to delete another user's media. Proceed with caution." +msgstr "" + diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo Binary files differindex 0e0e240d..6308eaa6 100644 --- a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po index 611bae32..089a352a 100644 --- a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n" -"POT-Creation-Date: 2011-08-25 07:41-0500\n" -"PO-Revision-Date: 2011-08-25 12:41+0000\n" +"POT-Creation-Date: 2011-08-30 22:51-0500\n" +"PO-Revision-Date: 2011-08-31 03:51+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -18,49 +18,65 @@ msgstr "" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0\n" -#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:46 +#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:54 msgid "Username" msgstr "ユーザネーム" -#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50 +#: mediagoblin/auth/forms.py:28 +msgid "This is the name other users will identify you with." +msgstr "" + +#: mediagoblin/auth/forms.py:31 mediagoblin/auth/forms.py:58 msgid "Password" msgstr "パスワード" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:36 msgid "Passwords must match." msgstr "パスワードが一致している必要があります。" -#: mediagoblin/auth/forms.py:36 +#: mediagoblin/auth/forms.py:37 +msgid "Try to use a strong password!" +msgstr "" + +#: mediagoblin/auth/forms.py:40 msgid "Confirm password" msgstr "パスワードを確認" -#: mediagoblin/auth/forms.py:39 +#: mediagoblin/auth/forms.py:42 +msgid "Type it again here to make sure there are no spelling mistakes." +msgstr "" + +#: mediagoblin/auth/forms.py:45 msgid "Email address" msgstr "メールアドレス" +#: mediagoblin/auth/forms.py:48 +msgid "Your email will never be published." +msgstr "" + #: mediagoblin/auth/views.py:40 msgid "Sorry, registration is disabled on this instance." msgstr "申し訳ありませんが、このインスタンスで登録は無効になっています。" -#: mediagoblin/auth/views.py:57 +#: mediagoblin/auth/views.py:58 msgid "Sorry, a user with that name already exists." msgstr "申し訳ありませんが、その名前を持つユーザーがすでに存在しています。" -#: mediagoblin/auth/views.py:61 +#: mediagoblin/auth/views.py:62 msgid "Sorry, that email address has already been taken." msgstr "" -#: mediagoblin/auth/views.py:159 +#: mediagoblin/auth/views.py:160 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "メアドが確認されています。これで、ログインしてプロファイルを編集し、画像を提出することができます！" -#: mediagoblin/auth/views.py:165 +#: mediagoblin/auth/views.py:166 msgid "The verification key or user id is incorrect" msgstr "検証キーまたはユーザーIDが間違っています" -#: mediagoblin/auth/views.py:186 +#: mediagoblin/auth/views.py:187 #: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22 msgid "Resent your verification email." msgstr "検証メールを再送しました。" @@ -89,15 +105,15 @@ msgstr "自己紹介" msgid "Website" msgstr "URL" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "そのスラグを持つエントリは、このユーザーは既に存在します。" -#: mediagoblin/edit/views.py:94 +#: mediagoblin/edit/views.py:95 msgid "You are editing another user's media. Proceed with caution." msgstr "あなたは、他のユーザーのメディアを編集しています。ご注意ください。" -#: mediagoblin/edit/views.py:165 +#: mediagoblin/edit/views.py:166 msgid "You are editing a user's profile. Proceed with caution." msgstr "あなたは、他のユーザーのプロファイルを編集しています。ご注意ください。" @@ -164,10 +180,8 @@ msgstr "ログイン" #: mediagoblin/templates/mediagoblin/base.html:89 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU project</a>" +"href=\"http://gnu.org/\">GNU</a> project" msgstr "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU project</a>" #: mediagoblin/templates/mediagoblin/root.html:27 msgid "Hi there, media lover! MediaGoblin is..." @@ -255,6 +269,7 @@ msgstr "キャンセル" #: mediagoblin/templates/mediagoblin/edit/edit.html:37 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:44 msgid "Save changes" msgstr "投稿する" @@ -285,6 +300,17 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a>さんのコンテンツ" msgid "Sorry, no such user found." msgstr "申し訳ありませんが、そのユーザーは見つかりませんでした。" +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 +#, python-format +msgid "Really delete %(title)s?" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:36 +msgid "" +"If you choose yes, the media entry will be deleted " +"<strong>permanently.</strong>" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22 msgid "Media processing panel" msgstr "" @@ -390,4 +416,8 @@ msgstr "" msgid "Comment" msgstr "" +#: mediagoblin/user_pages/views.py:176 +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 Binary files differindex 931d51b9..809cd90d 100644 --- a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po index 1a8fb631..7eed6f4e 100644 --- a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n" -"POT-Creation-Date: 2011-08-25 07:41-0500\n" -"PO-Revision-Date: 2011-08-25 12:41+0000\n" +"POT-Creation-Date: 2011-08-30 22:51-0500\n" +"PO-Revision-Date: 2011-08-31 03:51+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -18,39 +18,55 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:46 +#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:54 msgid "Username" msgstr "Gebruikersnaam" -#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50 +#: mediagoblin/auth/forms.py:28 +msgid "This is the name other users will identify you with." +msgstr "" + +#: mediagoblin/auth/forms.py:31 mediagoblin/auth/forms.py:58 msgid "Password" msgstr "Wachtwoord" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:36 msgid "Passwords must match." msgstr "Wachtwoorden moeten overeenkomen." -#: mediagoblin/auth/forms.py:36 +#: mediagoblin/auth/forms.py:37 +msgid "Try to use a strong password!" +msgstr "" + +#: mediagoblin/auth/forms.py:40 msgid "Confirm password" msgstr "Bevestig wachtwoord" -#: mediagoblin/auth/forms.py:39 +#: mediagoblin/auth/forms.py:42 +msgid "Type it again here to make sure there are no spelling mistakes." +msgstr "" + +#: mediagoblin/auth/forms.py:45 msgid "Email address" msgstr "E-mail adres" +#: mediagoblin/auth/forms.py:48 +msgid "Your email will never be published." +msgstr "" + #: mediagoblin/auth/views.py:40 msgid "Sorry, registration is disabled on this instance." msgstr "Sorry, registratie is uitgeschakeld op deze instantie." -#: mediagoblin/auth/views.py:57 +#: mediagoblin/auth/views.py:58 msgid "Sorry, a user with that name already exists." msgstr "Sorry, er bestaat al een gebruiker met die naam." -#: mediagoblin/auth/views.py:61 +#: mediagoblin/auth/views.py:62 msgid "Sorry, that email address has already been taken." msgstr "Sorry, dat e-mailadres is al ingenomen." -#: mediagoblin/auth/views.py:159 +#: mediagoblin/auth/views.py:160 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" @@ -58,11 +74,11 @@ msgstr "" "Uw e-mailadres is geverifieerd. U kunt nu inloggen, uw profiel bewerken, en " "afbeeldingen toevoegen!" -#: mediagoblin/auth/views.py:165 +#: mediagoblin/auth/views.py:166 msgid "The verification key or user id is incorrect" msgstr "De verificatie sleutel of gebruikers-ID is onjuist" -#: mediagoblin/auth/views.py:186 +#: mediagoblin/auth/views.py:187 #: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22 msgid "Resent your verification email." msgstr "Verificatie e-mail opnieuw opgestuurd." @@ -91,17 +107,17 @@ msgstr "Bio" msgid "Website" msgstr "Website" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:94 +#: mediagoblin/edit/views.py:95 msgid "You are editing another user's media. Proceed with caution." msgstr "" "U bent de media van een andere gebruiker aan het aanpassen. Ga voorzichtig " "te werk." -#: mediagoblin/edit/views.py:165 +#: mediagoblin/edit/views.py:166 msgid "You are editing a user's profile. Proceed with caution." msgstr "" "U bent een gebruikersprofiel aan het aanpassen. Ga voorzichtig te werk." @@ -169,10 +185,8 @@ msgstr "Inloggen" #: mediagoblin/templates/mediagoblin/base.html:89 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU project</a>" +"href=\"http://gnu.org/\">GNU</a> project" msgstr "" -"Aangedreven door <a href=\"http://mediagoblin.org\">MediaGoblin</a> , een <a" -" href=\"http://gnu.org/\">GNU-project</a>" #: mediagoblin/templates/mediagoblin/root.html:27 msgid "Hi there, media lover! MediaGoblin is..." @@ -257,6 +271,7 @@ msgstr "Annuleren" #: mediagoblin/templates/mediagoblin/edit/edit.html:37 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:44 msgid "Save changes" msgstr "Wijzigingen opslaan" @@ -287,6 +302,17 @@ msgstr "Media van <a href=\"%(user_url)s\"> %(username)s </a>" msgid "Sorry, no such user found." msgstr "Sorry, die gebruiker kon niet worden gevonden." +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 +#, python-format +msgid "Really delete %(title)s?" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:36 +msgid "" +"If you choose yes, the media entry will be deleted " +"<strong>permanently.</strong>" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22 msgid "Media processing panel" msgstr "" @@ -396,4 +422,8 @@ msgstr "" msgid "Comment" msgstr "Commentaar" +#: mediagoblin/user_pages/views.py:176 +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 Binary files differindex 8bdb4a92..8c196295 100644 --- a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po index f4c97b12..c4b42d89 100644 --- a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n" -"POT-Creation-Date: 2011-08-25 07:41-0500\n" -"PO-Revision-Date: 2011-08-25 12:41+0000\n" +"POT-Creation-Date: 2011-08-30 22:51-0500\n" +"PO-Revision-Date: 2011-08-31 03:51+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -18,39 +18,55 @@ msgstr "" "Language: nn_NO\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:46 +#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:54 msgid "Username" msgstr "Brukarnamn" -#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50 +#: mediagoblin/auth/forms.py:28 +msgid "This is the name other users will identify you with." +msgstr "" + +#: mediagoblin/auth/forms.py:31 mediagoblin/auth/forms.py:58 msgid "Password" msgstr "Passord" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:36 msgid "Passwords must match." msgstr "Passorda må vera like." -#: mediagoblin/auth/forms.py:36 +#: mediagoblin/auth/forms.py:37 +msgid "Try to use a strong password!" +msgstr "" + +#: mediagoblin/auth/forms.py:40 msgid "Confirm password" msgstr "Gjenta passord" -#: mediagoblin/auth/forms.py:39 +#: mediagoblin/auth/forms.py:42 +msgid "Type it again here to make sure there are no spelling mistakes." +msgstr "" + +#: mediagoblin/auth/forms.py:45 msgid "Email address" msgstr "E-postadresse" +#: mediagoblin/auth/forms.py:48 +msgid "Your email will never be published." +msgstr "" + #: mediagoblin/auth/views.py:40 msgid "Sorry, registration is disabled on this instance." msgstr "Registrering er slege av. Orsak." -#: mediagoblin/auth/views.py:57 +#: mediagoblin/auth/views.py:58 msgid "Sorry, a user with that name already exists." msgstr "Ein konto med dette brukarnamnet finst allereide." -#: mediagoblin/auth/views.py:61 +#: mediagoblin/auth/views.py:62 msgid "Sorry, that email address has already been taken." -msgstr "" +msgstr "Den epostadressa er allereide teken." -#: mediagoblin/auth/views.py:159 +#: mediagoblin/auth/views.py:160 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" @@ -58,11 +74,11 @@ 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:165 +#: mediagoblin/auth/views.py:166 msgid "The verification key or user id is incorrect" msgstr "Stadfestingsnykelen eller brukar-ID-en din er feil." -#: mediagoblin/auth/views.py:186 +#: mediagoblin/auth/views.py:187 #: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22 msgid "Resent your verification email." msgstr "Send ein ny stadfestingsepost." @@ -91,21 +107,21 @@ msgstr "Presentasjon" msgid "Website" msgstr "Heimeside" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "Eit innlegg med denne adressetittelen finst allereie." -#: mediagoblin/edit/views.py:94 +#: mediagoblin/edit/views.py:95 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:165 +#: mediagoblin/edit/views.py:166 msgid "You are editing a user's profile. Proceed with caution." msgstr "Ver forsiktig, du redigerer ein annan konto sin profil." #: mediagoblin/process_media/errors.py:44 msgid "Invalid file given for media type." -msgstr "" +msgstr "Ugyldig fil for mediatypen." #: mediagoblin/submit/forms.py:25 msgid "File" @@ -125,21 +141,22 @@ msgstr "Johoo! Opplasta!" #: mediagoblin/templates/mediagoblin/404.html:21 msgid "Oops!" -msgstr "" +msgstr "Oops." #: mediagoblin/templates/mediagoblin/404.html:24 msgid "There doesn't seem to be a page at this address. Sorry!" -msgstr "" +msgstr "Det ser ikkje ut til å vera noko her..." #: mediagoblin/templates/mediagoblin/404.html:26 msgid "" "If you're sure the address is correct, maybe the page you're looking for has" " been moved or deleted." msgstr "" +"Er du sikker på at adressa er korrekt, så er ho truleg flytta eller sletta." #: mediagoblin/templates/mediagoblin/404.html:32 msgid "Image of 404 goblin stressing out" -msgstr "" +msgstr "Bilete av stressa 404-troll." #: mediagoblin/templates/mediagoblin/base.html:22 msgid "GNU MediaGoblin" @@ -147,7 +164,7 @@ msgstr "GNU MediaGoblin" #: mediagoblin/templates/mediagoblin/base.html:47 msgid "MediaGoblin logo" -msgstr "" +msgstr "MediaGoblin" #: mediagoblin/templates/mediagoblin/base.html:52 msgid "Submit media" @@ -166,42 +183,44 @@ msgstr "Logg inn" #: mediagoblin/templates/mediagoblin/base.html:89 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU project</a>" +"href=\"http://gnu.org/\">GNU</a> project" msgstr "" -"Driven av <a href=\"http://mediagoblin.org\">MediaGoblin</a>, eit <a " -"href=\"http://gnu.org/\">GNU-prosjekt</a>" #: mediagoblin/templates/mediagoblin/root.html:27 msgid "Hi there, media lover! MediaGoblin is..." -msgstr "" +msgstr "Hei der mediaentusiast, MediaGoblin..." #: mediagoblin/templates/mediagoblin/root.html:29 msgid "The perfect place for your media!" -msgstr "" +msgstr "Er ein perfekt plass for mediet ditt!" #: mediagoblin/templates/mediagoblin/root.html:30 msgid "" "A place for people to collaborate and show off original and derived " "creations!" msgstr "" +"Er ein plass for folk å samarbeida og visa fram sjølvlaga og vidarebygde " +"verk." #: mediagoblin/templates/mediagoblin/root.html:31 msgid "" "Free, as in freedom. (We’re a <a href=\"http://gnu.org\">GNU</a> project, " "after all.)" -msgstr "" +msgstr "Fri som i fridom (me er eit <a href=\"http://gnu.org\">GNU</a>-prosjekt)." #: mediagoblin/templates/mediagoblin/root.html:32 msgid "" "Aiming to make the world a better place through decentralization and " "(eventually, coming soon!) federation!" msgstr "" +"Arbeidar for å gjera verda ein betre stad gjennom desentralisering (til " +"slutt, kjem snart!) federering." #: mediagoblin/templates/mediagoblin/root.html:33 msgid "" "Built for extensibility. (Multiple media types coming soon to the software," " including video support!)" -msgstr "" +msgstr "Bygd for utviding (fleire medietypar kjem snart, m.a. video)." #: mediagoblin/templates/mediagoblin/root.html:34 msgid "" @@ -209,10 +228,13 @@ msgid "" "href=\"http://mediagoblin.org/pages/join.html\">You can help us improve this" " software!</a>)" msgstr "" +"Driven av folk som deg. (<a " +"href=\"http://mediagoblin.org/pages/join.html\">Du kan hjelpa med å forbetra" +" MediaGoblin</a>)" #: mediagoblin/templates/mediagoblin/auth/login.html:29 msgid "Logging in failed!" -msgstr "" +msgstr "Innlogging feila" #: mediagoblin/templates/mediagoblin/auth/login.html:42 msgid "Don't have an account yet?" @@ -228,7 +250,7 @@ msgstr "Lag ein konto." #: mediagoblin/templates/mediagoblin/auth/register.html:30 msgid "Create" -msgstr "" +msgstr "Opprett" #: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19 #, python-format @@ -257,6 +279,7 @@ msgstr "Avbryt" #: mediagoblin/templates/mediagoblin/edit/edit.html:37 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:44 msgid "Save changes" msgstr "Lagra" @@ -287,35 +310,46 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a> sin mediafiler" msgid "Sorry, no such user found." msgstr "Fann ingen slik brukar" +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 +#, python-format +msgid "Really delete %(title)s?" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:36 +msgid "" +"If you choose yes, the media entry will be deleted " +"<strong>permanently.</strong>" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22 msgid "Media processing panel" -msgstr "" +msgstr "Mediehandsamingspanel" #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:25 msgid "" "You can track the state of media being processed for your gallery here." -msgstr "" +msgstr "Sjå status for mediehandsaming av biletene dine her." #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:28 msgid "Media in-processing" -msgstr "" +msgstr "Media under handsaming" #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:46 msgid "No media in-processing" -msgstr "" +msgstr "Ingen media under handsaming" #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:50 msgid "These uploads failed to process:" -msgstr "" +msgstr "Klarte ikkje handsame desse opplasta filene:" #: mediagoblin/templates/mediagoblin/user_pages/user.html:39 #: mediagoblin/templates/mediagoblin/user_pages/user.html:59 msgid "Email verification needed" -msgstr "" +msgstr "Epostverifisering trengst." #: mediagoblin/templates/mediagoblin/user_pages/user.html:42 msgid "Almost done! Your account still needs to be activated." -msgstr "" +msgstr "Nesten ferdig. Du treng berre aktivera kontoen." #: mediagoblin/templates/mediagoblin/user_pages/user.html:47 msgid "" @@ -334,7 +368,7 @@ msgstr "Send ein ny epost" msgid "" "Someone has registered an account with this username, but it still has to be" " activated." -msgstr "" +msgstr "Dette brukarnamnet finst allereie, men det er ikkje aktivert." #: mediagoblin/templates/mediagoblin/user_pages/user.html:68 #, python-format @@ -352,7 +386,7 @@ msgstr "%(username)s sin profil" #: mediagoblin/templates/mediagoblin/user_pages/user.html:85 msgid "Here's a spot to tell others about yourself." -msgstr "" +msgstr "Her kan du fortelja om deg sjølv." #: mediagoblin/templates/mediagoblin/user_pages/user.html:90 #: mediagoblin/templates/mediagoblin/user_pages/user.html:108 @@ -361,7 +395,7 @@ msgstr "Endra profil" #: mediagoblin/templates/mediagoblin/user_pages/user.html:96 msgid "This user hasn't filled in their profile (yet)." -msgstr "" +msgstr "Brukaren har ikkje fylt ut profilen sin (enno)." #: mediagoblin/templates/mediagoblin/user_pages/user.html:122 #, python-format @@ -372,26 +406,30 @@ msgstr "Sjå all media frå %(username)s" msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." -msgstr "" +msgstr "Her kjem mediet ditt. Ser ikkje ut til at du har lagt til noko." #: mediagoblin/templates/mediagoblin/user_pages/user.html:141 msgid "Add media" -msgstr "" +msgstr "Legg til media" #: mediagoblin/templates/mediagoblin/user_pages/user.html:147 msgid "There doesn't seem to be any media here yet..." -msgstr "" +msgstr "Ser ikkje ut til at det finst noko media her nett no." #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21 msgid "feed icon" -msgstr "" +msgstr " " #: mediagoblin/templates/mediagoblin/utils/feed_link.html:23 msgid "Atom feed" -msgstr "" +msgstr "Atom-kjelde" #: mediagoblin/user_pages/forms.py:24 msgid "Comment" +msgstr "Innspel" + +#: mediagoblin/user_pages/views.py:176 +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 Binary files differindex b2e1161e..28cf6af2 100644 --- a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po index 438af907..8c5ab19e 100644 --- a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n" -"POT-Creation-Date: 2011-08-25 07:41-0500\n" -"PO-Revision-Date: 2011-08-25 12:41+0000\n" +"POT-Creation-Date: 2011-08-30 22:51-0500\n" +"PO-Revision-Date: 2011-08-31 03:51+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,39 +18,55 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:46 +#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:54 msgid "Username" msgstr "Nome de Usuário" -#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50 +#: mediagoblin/auth/forms.py:28 +msgid "This is the name other users will identify you with." +msgstr "" + +#: mediagoblin/auth/forms.py:31 mediagoblin/auth/forms.py:58 msgid "Password" msgstr "Senha" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:36 msgid "Passwords must match." msgstr "Senhas devem ser iguais." -#: mediagoblin/auth/forms.py:36 +#: mediagoblin/auth/forms.py:37 +msgid "Try to use a strong password!" +msgstr "" + +#: mediagoblin/auth/forms.py:40 msgid "Confirm password" msgstr "Confirmar senha" -#: mediagoblin/auth/forms.py:39 +#: mediagoblin/auth/forms.py:42 +msgid "Type it again here to make sure there are no spelling mistakes." +msgstr "" + +#: mediagoblin/auth/forms.py:45 msgid "Email address" msgstr "Endereço de email" +#: mediagoblin/auth/forms.py:48 +msgid "Your email will never be published." +msgstr "" + #: mediagoblin/auth/views.py:40 msgid "Sorry, registration is disabled on this instance." msgstr "Desculpa, o registro está desativado neste momento." -#: mediagoblin/auth/views.py:57 +#: mediagoblin/auth/views.py:58 msgid "Sorry, a user with that name already exists." msgstr "Desculpe, um usuário com este nome já existe." -#: mediagoblin/auth/views.py:61 +#: mediagoblin/auth/views.py:62 msgid "Sorry, that email address has already been taken." msgstr "" -#: mediagoblin/auth/views.py:159 +#: mediagoblin/auth/views.py:160 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" @@ -58,11 +74,11 @@ 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:165 +#: mediagoblin/auth/views.py:166 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:186 +#: mediagoblin/auth/views.py:187 #: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22 msgid "Resent your verification email." msgstr "O email de verificação foi reenviado." @@ -91,15 +107,15 @@ msgstr "Biográfia" msgid "Website" msgstr "Website" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:94 +#: mediagoblin/edit/views.py:95 msgid "You are editing another user's media. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:165 +#: mediagoblin/edit/views.py:166 msgid "You are editing a user's profile. Proceed with caution." msgstr "" @@ -166,10 +182,8 @@ msgstr "Entrar" #: mediagoblin/templates/mediagoblin/base.html:89 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU project</a>" +"href=\"http://gnu.org/\">GNU</a> project" msgstr "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU project</a>" #: mediagoblin/templates/mediagoblin/root.html:27 msgid "Hi there, media lover! MediaGoblin is..." @@ -257,6 +271,7 @@ msgstr "Cancelar" #: mediagoblin/templates/mediagoblin/edit/edit.html:37 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:44 msgid "Save changes" msgstr "Salvar mudanças" @@ -287,6 +302,17 @@ msgstr "" msgid "Sorry, no such user found." msgstr "Desculpe, tal usuário não encontrado." +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 +#, python-format +msgid "Really delete %(title)s?" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:36 +msgid "" +"If you choose yes, the media entry will be deleted " +"<strong>permanently.</strong>" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22 msgid "Media processing panel" msgstr "" @@ -394,4 +420,8 @@ msgstr "" msgid "Comment" msgstr "" +#: mediagoblin/user_pages/views.py:176 +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 Binary files differindex a3f48cd7..4c3e785c 100644 --- a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po index 4ae3290c..1c366b06 100644 --- a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n" -"POT-Creation-Date: 2011-08-25 07:41-0500\n" -"PO-Revision-Date: 2011-08-25 17:38+0000\n" -"Last-Translator: gap <gapop@hotmail.com>\n" +"POT-Creation-Date: 2011-08-30 22:51-0500\n" +"PO-Revision-Date: 2011-08-31 03:51+0000\n" +"Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,39 +18,55 @@ 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:46 +#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:54 msgid "Username" msgstr "Nume de utilizator" -#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50 +#: mediagoblin/auth/forms.py:28 +msgid "This is the name other users will identify you with." +msgstr "" + +#: mediagoblin/auth/forms.py:31 mediagoblin/auth/forms.py:58 msgid "Password" msgstr "Parolă" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:36 msgid "Passwords must match." msgstr "Parolele trebuie să fie identice." -#: mediagoblin/auth/forms.py:36 +#: mediagoblin/auth/forms.py:37 +msgid "Try to use a strong password!" +msgstr "" + +#: mediagoblin/auth/forms.py:40 msgid "Confirm password" msgstr "Reintroduceți parola" -#: mediagoblin/auth/forms.py:39 +#: mediagoblin/auth/forms.py:42 +msgid "Type it again here to make sure there are no spelling mistakes." +msgstr "" + +#: mediagoblin/auth/forms.py:45 msgid "Email address" msgstr "Adresa de e-mail" +#: mediagoblin/auth/forms.py:48 +msgid "Your email will never be published." +msgstr "" + #: mediagoblin/auth/views.py:40 msgid "Sorry, registration is disabled on this instance." msgstr "Ne pare rău, dar înscrierile sunt dezactivate pe această instanță." -#: mediagoblin/auth/views.py:57 +#: mediagoblin/auth/views.py:58 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:61 +#: mediagoblin/auth/views.py:62 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:159 +#: mediagoblin/auth/views.py:160 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" @@ -58,11 +74,11 @@ msgstr "" "Adresa dvs. de e-mail a fost confirmată. Puteți să vă autentificați, să vă " "modificați profilul și să trimiteți imagini!" -#: mediagoblin/auth/views.py:165 +#: mediagoblin/auth/views.py:166 msgid "The verification key or user id is incorrect" msgstr "Cheie de verificare sau user ID incorect." -#: mediagoblin/auth/views.py:186 +#: mediagoblin/auth/views.py:187 #: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22 msgid "Resent your verification email." msgstr "E-mail-ul de verificare a fost retrimis." @@ -91,16 +107,16 @@ msgstr "Biografie" msgid "Website" msgstr "Sit Web" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "" "Există deja un entry cu același identificator pentru acest utilizator." -#: mediagoblin/edit/views.py:94 +#: mediagoblin/edit/views.py:95 msgid "You are editing another user's media. Proceed with caution." msgstr "Editați fișierul unui alt utilizator. Se recomandă prudență." -#: mediagoblin/edit/views.py:165 +#: mediagoblin/edit/views.py:166 msgid "You are editing a user's profile. Proceed with caution." msgstr "Editați profilul unui utilizator. Se recomandă prudență." @@ -169,10 +185,8 @@ msgstr "Autentificare" #: mediagoblin/templates/mediagoblin/base.html:89 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU project</a>" +"href=\"http://gnu.org/\">GNU</a> project" msgstr "" -"Construit cu <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un <a " -"href=\"http://gnu.org/\">proiect GNU</a>" #: mediagoblin/templates/mediagoblin/root.html:27 msgid "Hi there, media lover! MediaGoblin is..." @@ -270,6 +284,7 @@ msgstr "Anulare" #: mediagoblin/templates/mediagoblin/edit/edit.html:37 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:44 msgid "Save changes" msgstr "Salvează modificările" @@ -300,6 +315,17 @@ msgstr "Fișierele media ale lui <a href=\"%(user_url)s\">%(username)s</a>" msgid "Sorry, no such user found." msgstr "Ne pare rău, nu am găsit utilizatorul căutat." +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 +#, python-format +msgid "Really delete %(title)s?" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:36 +msgid "" +"If you choose yes, the media entry will be deleted " +"<strong>permanently.</strong>" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22 msgid "Media processing panel" msgstr "Panou de procesare media" @@ -412,4 +438,8 @@ msgstr "feed Atom" msgid "Comment" msgstr "Scrie un comentariu" +#: mediagoblin/user_pages/views.py:176 +msgid "You are about to delete another user's media. Proceed with caution." +msgstr "" + diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo Binary files differindex 49aa9ccb..babdb60e 100644 --- a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po index 9adc9b83..6fee7f3a 100644 --- a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n" -"POT-Creation-Date: 2011-08-25 07:41-0500\n" -"PO-Revision-Date: 2011-08-25 14:35+0000\n" -"Last-Translator: aleksejrs <deletesoftware@yandex.ru>\n" +"POT-Creation-Date: 2011-08-30 22:51-0500\n" +"PO-Revision-Date: 2011-08-31 03:51+0000\n" +"Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,52 +18,70 @@ 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:46 +#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:54 msgid "Username" msgstr "Логин" -#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50 +#: mediagoblin/auth/forms.py:28 +msgid "This is the name other users will identify you with." +msgstr "" + +#: mediagoblin/auth/forms.py:31 mediagoblin/auth/forms.py:58 msgid "Password" msgstr "Пароль" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:36 msgid "Passwords must match." msgstr "Пароли должны совпадать." -#: mediagoblin/auth/forms.py:36 +#: mediagoblin/auth/forms.py:37 +msgid "Try to use a strong password!" +msgstr "" + +#: mediagoblin/auth/forms.py:40 msgid "Confirm password" msgstr "Подтвердите пароль" -#: mediagoblin/auth/forms.py:39 +#: mediagoblin/auth/forms.py:42 +msgid "Type it again here to make sure there are no spelling mistakes." +msgstr "" + +#: mediagoblin/auth/forms.py:45 msgid "Email address" msgstr "Адрес электронной почты" +#: mediagoblin/auth/forms.py:48 +msgid "Your email will never be published." +msgstr "" + #: mediagoblin/auth/views.py:40 msgid "Sorry, registration is disabled on this instance." -msgstr "" +msgstr "Извините, на этом разделе регистрация запрещена." -#: mediagoblin/auth/views.py:57 +#: mediagoblin/auth/views.py:58 msgid "Sorry, a user with that name already exists." -msgstr "" +msgstr "Извините, пользователь с этим именем уже зарегистрирован." -#: mediagoblin/auth/views.py:61 +#: mediagoblin/auth/views.py:62 msgid "Sorry, that email address has already been taken." -msgstr "" +msgstr "Извините, этот адрес электнонной почты уже занят." -#: mediagoblin/auth/views.py:159 +#: mediagoblin/auth/views.py:160 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "" +"Адрес вашей электронной потвержден. Вы теперь можете войти и начать " +"редактировать свой профиль и загружать новые изображения!" -#: mediagoblin/auth/views.py:165 +#: mediagoblin/auth/views.py:166 msgid "The verification key or user id is incorrect" -msgstr "" +msgstr "Неверный ключ проверки или идентификатор пользователя" -#: mediagoblin/auth/views.py:186 +#: mediagoblin/auth/views.py:187 #: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22 msgid "Resent your verification email." -msgstr "" +msgstr "Переслать сообщение с подтверждением аккаунта." #: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27 msgid "Title" @@ -83,28 +101,28 @@ msgstr "Метки" #: mediagoblin/edit/forms.py:38 msgid "Bio" -msgstr "" +msgstr "Биограаия" #: mediagoblin/edit/forms.py:41 msgid "Website" msgstr "Сайт" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "" "У этого пользователя уже есть файл с такой отличительной частью адреса." -#: mediagoblin/edit/views.py:94 +#: mediagoblin/edit/views.py:95 msgid "You are editing another user's media. Proceed with caution." -msgstr "" +msgstr "Вы редактируете файлы другого пользователя. Будьте осторожны." -#: mediagoblin/edit/views.py:165 +#: mediagoblin/edit/views.py:166 msgid "You are editing a user's profile. Proceed with caution." -msgstr "" +msgstr "Вы редактируете профиль пользователя. Будьте осторожны." #: mediagoblin/process_media/errors.py:44 msgid "Invalid file given for media type." -msgstr "" +msgstr "Неправильный формат файла." #: mediagoblin/submit/forms.py:25 msgid "File" @@ -112,7 +130,7 @@ msgstr "Файл" #: mediagoblin/submit/views.py:47 msgid "You must provide a file." -msgstr "" +msgstr "Вы должны загрузить файл." #: mediagoblin/submit/views.py:50 msgid "The file doesn't seem to be an image!" @@ -128,17 +146,17 @@ msgstr "Ой!" #: mediagoblin/templates/mediagoblin/404.html:24 msgid "There doesn't seem to be a page at this address. Sorry!" -msgstr "" +msgstr "Кажется, такой страницы не существует. Уж извините!" #: mediagoblin/templates/mediagoblin/404.html:26 msgid "" "If you're sure the address is correct, maybe the page you're looking for has" " been moved or deleted." -msgstr "" +msgstr "Возможно, страница которую вы ищете была удалена или переехала." #: mediagoblin/templates/mediagoblin/404.html:32 msgid "Image of 404 goblin stressing out" -msgstr "" +msgstr "Изображение 404 нервничающего гоблина" #: mediagoblin/templates/mediagoblin/base.html:22 msgid "GNU MediaGoblin" @@ -150,7 +168,7 @@ msgstr "Символ MediaGoblin" #: mediagoblin/templates/mediagoblin/base.html:52 msgid "Submit media" -msgstr "" +msgstr "Загрузить файл" #: mediagoblin/templates/mediagoblin/base.html:63 msgid "verify your email!" @@ -160,27 +178,29 @@ msgstr "подтвердите ваш адрес электронной почт #: mediagoblin/templates/mediagoblin/auth/login.html:26 #: mediagoblin/templates/mediagoblin/auth/login.html:34 msgid "Log in" -msgstr "Представиться" +msgstr "Войти" #: mediagoblin/templates/mediagoblin/base.html:89 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU project</a>" +"href=\"http://gnu.org/\">GNU</a> project" msgstr "" #: mediagoblin/templates/mediagoblin/root.html:27 msgid "Hi there, media lover! MediaGoblin is..." -msgstr "" +msgstr "Привет, любитель мультимедиа! Mediagoblin это..." #: mediagoblin/templates/mediagoblin/root.html:29 msgid "The perfect place for your media!" -msgstr "" +msgstr "Отличное место для ваших файлов!" #: mediagoblin/templates/mediagoblin/root.html:30 msgid "" "A place for people to collaborate and show off original and derived " "creations!" msgstr "" +"Место для того, чтобы совместно работать или просто показать свои " +"оригинальные и/или заимствованные создания!" #: mediagoblin/templates/mediagoblin/root.html:31 msgid "" @@ -193,6 +213,8 @@ msgid "" "Aiming to make the world a better place through decentralization and " "(eventually, coming soon!) federation!" msgstr "" +"Попытка сделать мир лучше с помощью децентрализации и (надеемся, что скоро!)" +" интеграции!" #: mediagoblin/templates/mediagoblin/root.html:33 msgid "" @@ -206,26 +228,29 @@ msgid "" "href=\"http://mediagoblin.org/pages/join.html\">You can help us improve this" " software!</a>)" msgstr "" +"Поддерживается такими же, как и ты. (<a " +"href=\"http://mediagoblin.org/pages/join.html\">Ты можешь помочь сделать это" +" ПО лучше!</a>)" #: mediagoblin/templates/mediagoblin/auth/login.html:29 msgid "Logging in failed!" -msgstr "" +msgstr "Авторизация неуспешна!" #: mediagoblin/templates/mediagoblin/auth/login.html:42 msgid "Don't have an account yet?" -msgstr "Ещё нет учётной записи?" +msgstr "Ещё нету аккаунта?" #: mediagoblin/templates/mediagoblin/auth/login.html:45 msgid "Create one here!" -msgstr "Создайте её здесь!" +msgstr "Создайте здесь!" #: mediagoblin/templates/mediagoblin/auth/register.html:27 msgid "Create an account!" -msgstr "Создаём учётную запись!" +msgstr "Создать аккаунт!" #: mediagoblin/templates/mediagoblin/auth/register.html:30 msgid "Create" -msgstr "" +msgstr "Создать" #: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19 #, python-format @@ -239,7 +264,7 @@ msgid "" msgstr "" "Привет, %(username)s!\n" "\n" -"Чтобы активировать свою учётную запись в GNU MediaGoblin, откройте в своём веб‐браузере следующую ссылку:\n" +"Чтобы активировать свой аккаунт в GNU MediaGoblin, откройте в своём веб‐браузере следующую ссылку:\n" "\n" "%(verification_url)s" @@ -254,6 +279,7 @@ msgstr "Отменить" #: mediagoblin/templates/mediagoblin/edit/edit.html:37 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:44 msgid "Save changes" msgstr "Сохранить изменения" @@ -268,11 +294,11 @@ msgstr "Файлы с меткой:" #: mediagoblin/templates/mediagoblin/submit/start.html:26 msgid "Submit yer media" -msgstr "" +msgstr "Загрузить файл(ы)" #: mediagoblin/templates/mediagoblin/submit/start.html:29 msgid "Submit" -msgstr "" +msgstr "Подтвердить" #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:32 #, python-format @@ -282,56 +308,70 @@ msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:52 #: mediagoblin/templates/mediagoblin/user_pages/user.html:32 msgid "Sorry, no such user found." +msgstr "Извините, но такой пользователь не найден." + +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 +#, python-format +msgid "Really delete %(title)s?" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:36 +msgid "" +"If you choose yes, the media entry will be deleted " +"<strong>permanently.</strong>" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22 msgid "Media processing panel" -msgstr "" +msgstr "Панель обработки файлов" #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:25 msgid "" "You can track the state of media being processed for your gallery here." msgstr "" +"Вы можете следить за статусом обработки файлов для вашей галереи здесь." #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:28 msgid "Media in-processing" -msgstr "" +msgstr "Обработка файлов в процессе" #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:46 msgid "No media in-processing" -msgstr "" +msgstr "Нету файлов для обработки" #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:50 msgid "These uploads failed to process:" -msgstr "" +msgstr "Обработка этих файлов вызвала ошибку:" #: mediagoblin/templates/mediagoblin/user_pages/user.html:39 #: mediagoblin/templates/mediagoblin/user_pages/user.html:59 msgid "Email verification needed" -msgstr "" +msgstr "Нужно подтверджение почтового адреса" #: mediagoblin/templates/mediagoblin/user_pages/user.html:42 msgid "Almost done! Your account still needs to be activated." -msgstr "" +msgstr "Почти закончили! Теперь надо активизировать ваш аккаунт." #: mediagoblin/templates/mediagoblin/user_pages/user.html:47 msgid "" "An email should arrive in a few moments with instructions on how to do so." msgstr "" +"Через пару мгновений на адрес вашей электронной почты должно прийти " +"сообщение с дальнейшими инструкциями." #: mediagoblin/templates/mediagoblin/user_pages/user.html:51 msgid "In case it doesn't:" -msgstr "" +msgstr "А если нет, то:" #: mediagoblin/templates/mediagoblin/user_pages/user.html:54 msgid "Resend verification email" -msgstr "" +msgstr "Повторно отправить подверждение на адрес электнонной почты" #: mediagoblin/templates/mediagoblin/user_pages/user.html:62 msgid "" "Someone has registered an account with this username, but it still has to be" " activated." -msgstr "" +msgstr "Кто-то создал аккаунт с этим именем, но его еще надо активизировать." #: mediagoblin/templates/mediagoblin/user_pages/user.html:68 #, python-format @@ -339,6 +379,8 @@ 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 "" +"Если это были вы, и если вы потеряли сообщение с подтвердлением аккаунта, то" +" вы можете <a href=\"%(login_url)s\">войти</a> и отпраыить его повторно." #: mediagoblin/templates/mediagoblin/user_pages/user.html:78 #, python-format @@ -347,16 +389,16 @@ msgstr "Профиль пользователя %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/user.html:85 msgid "Here's a spot to tell others about yourself." -msgstr "" +msgstr "Здесь вы можете рассказать о себе." #: mediagoblin/templates/mediagoblin/user_pages/user.html:90 #: mediagoblin/templates/mediagoblin/user_pages/user.html:108 msgid "Edit profile" -msgstr "Изменить профиль" +msgstr "Редактировать профиль" #: mediagoblin/templates/mediagoblin/user_pages/user.html:96 msgid "This user hasn't filled in their profile (yet)." -msgstr "" +msgstr "Это пользователь не заполнил свой профайл (пока)." #: mediagoblin/templates/mediagoblin/user_pages/user.html:122 #, python-format @@ -367,15 +409,15 @@ msgstr "Смотреть все файлы %(username)s" msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." -msgstr "" +msgstr "Ваши файлы появятся здесь, кодга вы их добавите." #: mediagoblin/templates/mediagoblin/user_pages/user.html:141 msgid "Add media" -msgstr "" +msgstr "Добавить файлы" #: mediagoblin/templates/mediagoblin/user_pages/user.html:147 msgid "There doesn't seem to be any media here yet..." -msgstr "" +msgstr "Пока что тут файлов нет..." #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21 msgid "feed icon" @@ -387,6 +429,10 @@ msgstr "лента в формате Atom" #: mediagoblin/user_pages/forms.py:24 msgid "Comment" +msgstr "Комментарий" + +#: mediagoblin/user_pages/views.py:176 +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 Binary files differindex aaeec466..97723319 100644 --- a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po index 3db6ed4a..c2a28308 100644 --- a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n" -"POT-Creation-Date: 2011-08-25 07:41-0500\n" -"PO-Revision-Date: 2011-08-25 12:41+0000\n" +"POT-Creation-Date: 2011-08-30 22:51-0500\n" +"PO-Revision-Date: 2011-08-31 03:51+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -18,39 +18,55 @@ 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:46 +#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:54 msgid "Username" msgstr "Uporabniško ime" -#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50 +#: mediagoblin/auth/forms.py:28 +msgid "This is the name other users will identify you with." +msgstr "" + +#: mediagoblin/auth/forms.py:31 mediagoblin/auth/forms.py:58 msgid "Password" msgstr "Geslo" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:36 msgid "Passwords must match." msgstr "Gesli morata biti enaki." -#: mediagoblin/auth/forms.py:36 +#: mediagoblin/auth/forms.py:37 +msgid "Try to use a strong password!" +msgstr "" + +#: mediagoblin/auth/forms.py:40 msgid "Confirm password" msgstr "Potrdite geslo" -#: mediagoblin/auth/forms.py:39 +#: mediagoblin/auth/forms.py:42 +msgid "Type it again here to make sure there are no spelling mistakes." +msgstr "" + +#: mediagoblin/auth/forms.py:45 msgid "Email address" msgstr "E-poštni naslov" +#: mediagoblin/auth/forms.py:48 +msgid "Your email will never be published." +msgstr "" + #: mediagoblin/auth/views.py:40 msgid "Sorry, registration is disabled on this instance." msgstr "Oprostite, prijava za ta izvod ni omogočena." -#: mediagoblin/auth/views.py:57 +#: mediagoblin/auth/views.py:58 msgid "Sorry, a user with that name already exists." msgstr "Oprostite, uporabnik s tem imenom že obstaja." -#: mediagoblin/auth/views.py:61 +#: mediagoblin/auth/views.py:62 msgid "Sorry, that email address has already been taken." msgstr "Oprostite, ta e-poštni naslov je že v uporabi." -#: mediagoblin/auth/views.py:159 +#: mediagoblin/auth/views.py:160 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" @@ -58,11 +74,11 @@ msgstr "" "Vaš e-poštni naslov je bil potrjen. Sedaj se lahko prijavite, uredite svoj " "profil in pošljete slike." -#: mediagoblin/auth/views.py:165 +#: mediagoblin/auth/views.py:166 msgid "The verification key or user id is incorrect" msgstr "Potrditveni ključ ali uporabniška identifikacija je napačna" -#: mediagoblin/auth/views.py:186 +#: mediagoblin/auth/views.py:187 #: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22 msgid "Resent your verification email." msgstr "Ponovno pošiljanje potrditvene e-pošte." @@ -91,15 +107,15 @@ msgstr "Biografija" msgid "Website" msgstr "Spletna stran" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "Vnos s to oznako za tega uporabnika že obstaja." -#: mediagoblin/edit/views.py:94 +#: mediagoblin/edit/views.py:95 msgid "You are editing another user's media. Proceed with caution." msgstr "Urejate vsebino drugega uporabnika. Nadaljujte pazljivo." -#: mediagoblin/edit/views.py:165 +#: mediagoblin/edit/views.py:166 msgid "You are editing a user's profile. Proceed with caution." msgstr "Urejate uporabniški profil. Nadaljujte pazljivo." @@ -168,10 +184,8 @@ msgstr "Prijava" #: mediagoblin/templates/mediagoblin/base.html:89 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU project</a>" +"href=\"http://gnu.org/\">GNU</a> project" msgstr "" -"Stran poganja <a href=\"http://mediagoblin.org\">MediaGoblin</a>, del <a " -"href=\"http://gnu.org/\">projekta GNU</a>" #: mediagoblin/templates/mediagoblin/root.html:27 msgid "Hi there, media lover! MediaGoblin is..." @@ -269,6 +283,7 @@ msgstr "Prekliči" #: mediagoblin/templates/mediagoblin/edit/edit.html:37 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:44 msgid "Save changes" msgstr "Shrani spremembe" @@ -299,6 +314,17 @@ msgstr "Vsebina uporabnika <a href=\"%(user_url)s\">%(username)s</a>" msgid "Sorry, no such user found." msgstr "Oprostite, tega uporabnika ni bilo moč najti." +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 +#, python-format +msgid "Really delete %(title)s?" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:36 +msgid "" +"If you choose yes, the media entry will be deleted " +"<strong>permanently.</strong>" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22 msgid "Media processing panel" msgstr "Podokno obdelovanja vsebine" @@ -408,4 +434,8 @@ msgstr "Ikona Atom" msgid "Comment" msgstr "Komentar" +#: mediagoblin/user_pages/views.py:176 +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 Binary files differindex 2f9de271..d3336ad0 100644 --- a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po index 51c2e443..e37ae3c1 100644 --- a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n" -"POT-Creation-Date: 2011-08-25 07:41-0500\n" -"PO-Revision-Date: 2011-08-25 12:41+0000\n" +"POT-Creation-Date: 2011-08-30 22:51-0500\n" +"PO-Revision-Date: 2011-08-31 03:51+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,49 +17,65 @@ 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:46 +#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:54 msgid "Username" msgstr "" -#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50 +#: mediagoblin/auth/forms.py:28 +msgid "This is the name other users will identify you with." +msgstr "" + +#: mediagoblin/auth/forms.py:31 mediagoblin/auth/forms.py:58 msgid "Password" msgstr "" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:36 msgid "Passwords must match." msgstr "" -#: mediagoblin/auth/forms.py:36 +#: mediagoblin/auth/forms.py:37 +msgid "Try to use a strong password!" +msgstr "" + +#: mediagoblin/auth/forms.py:40 msgid "Confirm password" msgstr "" -#: mediagoblin/auth/forms.py:39 +#: mediagoblin/auth/forms.py:42 +msgid "Type it again here to make sure there are no spelling mistakes." +msgstr "" + +#: mediagoblin/auth/forms.py:45 msgid "Email address" msgstr "" +#: mediagoblin/auth/forms.py:48 +msgid "Your email will never be published." +msgstr "" + #: mediagoblin/auth/views.py:40 msgid "Sorry, registration is disabled on this instance." msgstr "" -#: mediagoblin/auth/views.py:57 +#: mediagoblin/auth/views.py:58 msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/views.py:61 +#: mediagoblin/auth/views.py:62 msgid "Sorry, that email address has already been taken." msgstr "" -#: mediagoblin/auth/views.py:159 +#: mediagoblin/auth/views.py:160 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "" -#: mediagoblin/auth/views.py:165 +#: mediagoblin/auth/views.py:166 msgid "The verification key or user id is incorrect" msgstr "" -#: mediagoblin/auth/views.py:186 +#: mediagoblin/auth/views.py:187 #: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22 msgid "Resent your verification email." msgstr "" @@ -88,15 +104,15 @@ msgstr "" msgid "Website" msgstr "" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:94 +#: mediagoblin/edit/views.py:95 msgid "You are editing another user's media. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:165 +#: mediagoblin/edit/views.py:166 msgid "You are editing a user's profile. Proceed with caution." msgstr "" @@ -163,7 +179,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/base.html:89 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU project</a>" +"href=\"http://gnu.org/\">GNU</a> project" msgstr "" #: mediagoblin/templates/mediagoblin/root.html:27 @@ -247,6 +263,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit.html:37 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:44 msgid "Save changes" msgstr "" @@ -277,6 +294,17 @@ msgstr "" msgid "Sorry, no such user found." msgstr "" +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 +#, python-format +msgid "Really delete %(title)s?" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:36 +msgid "" +"If you choose yes, the media entry will be deleted " +"<strong>permanently.</strong>" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22 msgid "Media processing panel" msgstr "" @@ -382,4 +410,8 @@ msgstr "" msgid "Comment" msgstr "" +#: mediagoblin/user_pages/views.py:176 +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 Binary files differindex 2136e0a3..f84cb70a 100644 --- a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po index dd30371a..b3883533 100644 --- a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n" -"POT-Creation-Date: 2011-08-25 07:41-0500\n" -"PO-Revision-Date: 2011-08-25 13:07+0000\n" -"Last-Translator: joar <transifex@wandborg.se>\n" +"POT-Creation-Date: 2011-08-30 22:51-0500\n" +"PO-Revision-Date: 2011-08-31 03:51+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,39 +18,55 @@ msgstr "" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:46 +#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:54 msgid "Username" msgstr "Användarnamn" -#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50 +#: mediagoblin/auth/forms.py:28 +msgid "This is the name other users will identify you with." +msgstr "" + +#: mediagoblin/auth/forms.py:31 mediagoblin/auth/forms.py:58 msgid "Password" msgstr "Lösenord" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:36 msgid "Passwords must match." msgstr "Lösenorden måste vara identiska." -#: mediagoblin/auth/forms.py:36 +#: mediagoblin/auth/forms.py:37 +msgid "Try to use a strong password!" +msgstr "" + +#: mediagoblin/auth/forms.py:40 msgid "Confirm password" msgstr "Bekräfta lösenord" -#: mediagoblin/auth/forms.py:39 +#: mediagoblin/auth/forms.py:42 +msgid "Type it again here to make sure there are no spelling mistakes." +msgstr "" + +#: mediagoblin/auth/forms.py:45 msgid "Email address" msgstr "E-postadress" +#: mediagoblin/auth/forms.py:48 +msgid "Your email will never be published." +msgstr "" + #: mediagoblin/auth/views.py:40 msgid "Sorry, registration is disabled on this instance." msgstr "Vi beklagar, registreringen är avtängd på den här instansen." -#: mediagoblin/auth/views.py:57 +#: mediagoblin/auth/views.py:58 msgid "Sorry, a user with that name already exists." msgstr "En användare med det användarnamnet finns redan." -#: mediagoblin/auth/views.py:61 +#: mediagoblin/auth/views.py:62 msgid "Sorry, that email address has already been taken." msgstr "Den e-postadressen är redan tagen." -#: mediagoblin/auth/views.py:159 +#: mediagoblin/auth/views.py:160 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" @@ -58,11 +74,11 @@ msgstr "" "Din e-postadress är verifierad. Du kan nu logga in, redigera din profil och " "ladda upp filer!" -#: mediagoblin/auth/views.py:165 +#: mediagoblin/auth/views.py:166 msgid "The verification key or user id is incorrect" msgstr "Verifieringsnyckeln eller användar-IDt är fel." -#: mediagoblin/auth/views.py:186 +#: mediagoblin/auth/views.py:187 #: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22 msgid "Resent your verification email." msgstr "Skickade ett nytt verifierings-email." @@ -91,15 +107,15 @@ msgstr "Presentation" msgid "Website" msgstr "Hemsida" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "Ett inlägg med det sökvägsnamnet existerar redan." -#: mediagoblin/edit/views.py:94 +#: mediagoblin/edit/views.py:95 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:165 +#: mediagoblin/edit/views.py:166 msgid "You are editing a user's profile. Proceed with caution." msgstr "Var försiktig, du redigerar en annan användares profil." @@ -168,10 +184,8 @@ msgstr "Logga in" #: mediagoblin/templates/mediagoblin/base.html:89 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU project</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:27 msgid "Hi there, media lover! MediaGoblin is..." @@ -273,6 +287,7 @@ msgstr "Avbryt" #: mediagoblin/templates/mediagoblin/edit/edit.html:37 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:44 msgid "Save changes" msgstr "Spara" @@ -303,6 +318,17 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a>s media" msgid "Sorry, no such user found." 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 "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:36 +msgid "" +"If you choose yes, the media entry will be deleted " +"<strong>permanently.</strong>" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22 msgid "Media processing panel" msgstr "Mediabehandlingspanel" @@ -416,4 +442,8 @@ msgstr "Atom-feed" msgid "Comment" msgstr "Kommentar" +#: mediagoblin/user_pages/views.py:176 +msgid "You are about to delete another user's media. Proceed with caution." +msgstr "" + diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo Binary files differindex ce7240fc..e2cdd52f 100644 --- a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po index 44670ab2..3020df07 100644 --- a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n" -"POT-Creation-Date: 2011-08-25 07:41-0500\n" -"PO-Revision-Date: 2011-08-25 12:41+0000\n" +"POT-Creation-Date: 2011-08-30 22:51-0500\n" +"PO-Revision-Date: 2011-08-31 03:51+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -18,52 +18,68 @@ msgstr "" "Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0\n" -#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:46 +#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:54 msgid "Username" msgstr "使用者名稱" -#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50 +#: mediagoblin/auth/forms.py:28 +msgid "This is the name other users will identify you with." +msgstr "" + +#: mediagoblin/auth/forms.py:31 mediagoblin/auth/forms.py:58 msgid "Password" msgstr "密碼" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:36 msgid "Passwords must match." -msgstr "密碼必須一至" +msgstr "密碼必須一致" -#: mediagoblin/auth/forms.py:36 +#: mediagoblin/auth/forms.py:37 +msgid "Try to use a strong password!" +msgstr "" + +#: mediagoblin/auth/forms.py:40 msgid "Confirm password" msgstr "確認密碼" -#: mediagoblin/auth/forms.py:39 +#: mediagoblin/auth/forms.py:42 +msgid "Type it again here to make sure there are no spelling mistakes." +msgstr "" + +#: mediagoblin/auth/forms.py:45 msgid "Email address" msgstr "電子郵件位置" +#: mediagoblin/auth/forms.py:48 +msgid "Your email will never be published." +msgstr "" + #: mediagoblin/auth/views.py:40 msgid "Sorry, registration is disabled on this instance." msgstr "抱歉, 這個項目已經被暫停註冊." -#: mediagoblin/auth/views.py:57 +#: mediagoblin/auth/views.py:58 msgid "Sorry, a user with that name already exists." msgstr "抱歉, 這個使用者名稱已經存在." -#: mediagoblin/auth/views.py:61 +#: mediagoblin/auth/views.py:62 msgid "Sorry, that email address has already been taken." -msgstr "" +msgstr "抱歉，這個電子郵件已經被其他人使用了。" -#: mediagoblin/auth/views.py:159 +#: mediagoblin/auth/views.py:160 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" -msgstr "你的電子郵件位址已被認證. 你現在就可以登入, 編輯你的個人檔案而且送出照片!" +msgstr "你的電子郵件位址已被認證. 你現在就可以登入, 編輯你的個人檔案而且遞交照片!" -#: mediagoblin/auth/views.py:165 +#: mediagoblin/auth/views.py:166 msgid "The verification key or user id is incorrect" msgstr "認證碼或是使用者帳號錯誤" -#: mediagoblin/auth/views.py:186 +#: mediagoblin/auth/views.py:187 #: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22 msgid "Resent your verification email." -msgstr "重送認證郵件." +msgstr "重送認證信." #: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27 msgid "Title" @@ -89,21 +105,21 @@ msgstr "自傳" msgid "Website" msgstr "網站" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "這個自訂字串已經被其他人用了" -#: mediagoblin/edit/views.py:94 +#: mediagoblin/edit/views.py:95 msgid "You are editing another user's media. Proceed with caution." msgstr "你正在編輯他人的媒體檔案. 請謹慎處理." -#: mediagoblin/edit/views.py:165 +#: mediagoblin/edit/views.py:166 msgid "You are editing a user's profile. Proceed with caution." -msgstr "你正在編輯他人的檔案. 請謹慎處理." +msgstr "你正在編輯一位用戶的檔案. 請謹慎處理." #: mediagoblin/process_media/errors.py:44 msgid "Invalid file given for media type." -msgstr "" +msgstr "指定錯誤的媒體類別！" #: mediagoblin/submit/forms.py:25 msgid "File" @@ -115,29 +131,29 @@ msgstr "你必須提供一個檔案" #: mediagoblin/submit/views.py:50 msgid "The file doesn't seem to be an image!" -msgstr "檔案看起來不像是一個圖片喔!" +msgstr "檔案似乎不是一個圖片喔!" #: mediagoblin/submit/views.py:122 msgid "Woohoo! Submitted!" -msgstr "喔耶! 送出去了!" +msgstr "呼嚕! 送出去了!" #: mediagoblin/templates/mediagoblin/404.html:21 msgid "Oops!" -msgstr "" +msgstr "糟糕！" #: mediagoblin/templates/mediagoblin/404.html:24 msgid "There doesn't seem to be a page at this address. Sorry!" -msgstr "" +msgstr "這個位址似乎沒有網頁。抱歉！" #: mediagoblin/templates/mediagoblin/404.html:26 msgid "" "If you're sure the address is correct, maybe the page you're looking for has" " been moved or deleted." -msgstr "" +msgstr "如果你確定這個位址是正確的，或許你在找的網頁已經被移除或是刪除了。" #: mediagoblin/templates/mediagoblin/404.html:32 msgid "Image of 404 goblin stressing out" -msgstr "" +msgstr "Image of 404 goblin stressing out" #: mediagoblin/templates/mediagoblin/base.html:22 msgid "GNU MediaGoblin" @@ -145,11 +161,11 @@ msgstr "GNU MediaGoblin" #: mediagoblin/templates/mediagoblin/base.html:47 msgid "MediaGoblin logo" -msgstr "" +msgstr "MediaGoblin 標誌" #: mediagoblin/templates/mediagoblin/base.html:52 msgid "Submit media" -msgstr "送出媒體" +msgstr "遞交媒體" #: mediagoblin/templates/mediagoblin/base.html:63 msgid "verify your email!" @@ -164,42 +180,40 @@ msgstr "登入" #: mediagoblin/templates/mediagoblin/base.html:89 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU project</a>" +"href=\"http://gnu.org/\">GNU</a> project" msgstr "" -"由 <a href=\"http://mediagoblin.org\">MediaGoblin</a> 製作, 她是一個 <a " -"href=\"http://gnu.org/\">GNU project</a>" #: mediagoblin/templates/mediagoblin/root.html:27 msgid "Hi there, media lover! MediaGoblin is..." -msgstr "" +msgstr "嗨！媒體愛好者！MediaGoblin是..." #: mediagoblin/templates/mediagoblin/root.html:29 msgid "The perfect place for your media!" -msgstr "" +msgstr "你的媒體檔案的最佳所在！" #: mediagoblin/templates/mediagoblin/root.html:30 msgid "" "A place for people to collaborate and show off original and derived " "creations!" -msgstr "" +msgstr "這是一個地方，可以讓人們協同且展示他們的創作或是衍生作品！" #: mediagoblin/templates/mediagoblin/root.html:31 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 "" "Aiming to make the world a better place through decentralization and " "(eventually, coming soon!) federation!" -msgstr "" +msgstr "目的是要透過分散式且自由的方式讓這個世界更美好！(終究，很快就會到來的！)" #: mediagoblin/templates/mediagoblin/root.html:33 msgid "" "Built for extensibility. (Multiple media types coming soon to the software," " including video support!)" -msgstr "" +msgstr "天生的擴充性. (軟體將支援多種多媒體格式, 也支援影音檔案！)" #: mediagoblin/templates/mediagoblin/root.html:34 msgid "" @@ -207,10 +221,12 @@ msgid "" "href=\"http://mediagoblin.org/pages/join.html\">You can help us improve this" " software!</a>)" msgstr "" +"由像你一樣的人們製作 (<a " +"href=\"http://mediagoblin.org/pages/join.html\">你可以幫我們改進軟體!</a>)" #: mediagoblin/templates/mediagoblin/auth/login.html:29 msgid "Logging in failed!" -msgstr "" +msgstr "登入失敗！" #: mediagoblin/templates/mediagoblin/auth/login.html:42 msgid "Don't have an account yet?" @@ -226,7 +242,7 @@ msgstr "建立一個帳號!" #: mediagoblin/templates/mediagoblin/auth/register.html:30 msgid "Create" -msgstr "" +msgstr "建立" #: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19 #, python-format @@ -255,6 +271,7 @@ msgstr "取消" #: mediagoblin/templates/mediagoblin/edit/edit.html:37 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:44 msgid "Save changes" msgstr "儲存變更" @@ -269,7 +286,7 @@ msgstr "媒體被標籤為:" #: mediagoblin/templates/mediagoblin/submit/start.html:26 msgid "Submit yer media" -msgstr "送出你的媒體檔案" +msgstr "遞交你的媒體檔案" #: mediagoblin/templates/mediagoblin/submit/start.html:29 msgid "Submit" @@ -283,42 +300,53 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a>的媒體" #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:52 #: mediagoblin/templates/mediagoblin/user_pages/user.html:32 msgid "Sorry, no such user found." -msgstr "抱歉, 找不到這個使用者." +msgstr "抱歉，找不到這個使用者." + +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 +#, python-format +msgid "Really delete %(title)s?" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:36 +msgid "" +"If you choose yes, the media entry will be deleted " +"<strong>permanently.</strong>" +msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22 msgid "Media processing panel" -msgstr "" +msgstr "媒體處理面板" #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:25 msgid "" "You can track the state of media being processed for your gallery here." -msgstr "" +msgstr "針對你的展示區，你可以在這裡追蹤媒體處理的狀態。" #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:28 msgid "Media in-processing" -msgstr "" +msgstr "媒體處理中" #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:46 msgid "No media in-processing" -msgstr "" +msgstr "沒有媒體正在處理" #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:50 msgid "These uploads failed to process:" -msgstr "" +msgstr "無法處理這些更新" #: mediagoblin/templates/mediagoblin/user_pages/user.html:39 #: mediagoblin/templates/mediagoblin/user_pages/user.html:59 msgid "Email verification needed" -msgstr "" +msgstr "需要認證電子郵件" #: mediagoblin/templates/mediagoblin/user_pages/user.html:42 msgid "Almost done! Your account still needs to be activated." -msgstr "" +msgstr "幾乎完成了！你的帳號仍然需要被啟用。" #: mediagoblin/templates/mediagoblin/user_pages/user.html:47 msgid "" "An email should arrive in a few moments with instructions on how to do so." -msgstr "很快的會有一封電子郵件告訴你如何做." +msgstr "馬上會有一封電子郵件告訴你如何做." #: mediagoblin/templates/mediagoblin/user_pages/user.html:51 msgid "In case it doesn't:" @@ -326,13 +354,13 @@ msgstr "假設它無法:" #: mediagoblin/templates/mediagoblin/user_pages/user.html:54 msgid "Resend verification email" -msgstr "重送認證郵件 " +msgstr "重送認證信" #: mediagoblin/templates/mediagoblin/user_pages/user.html:62 msgid "" "Someone has registered an account with this username, but it still has to be" " activated." -msgstr "" +msgstr "有人用了這個帳號登錄了，但是這個帳號仍需要被啟用。" #: mediagoblin/templates/mediagoblin/user_pages/user.html:68 #, python-format @@ -348,7 +376,7 @@ msgstr "%(username)s的個人檔案" #: mediagoblin/templates/mediagoblin/user_pages/user.html:85 msgid "Here's a spot to tell others about yourself." -msgstr "" +msgstr "這是一個地方，能讓你向他人介紹自己。" #: mediagoblin/templates/mediagoblin/user_pages/user.html:90 #: mediagoblin/templates/mediagoblin/user_pages/user.html:108 @@ -357,7 +385,7 @@ msgstr "編輯個人檔案" #: mediagoblin/templates/mediagoblin/user_pages/user.html:96 msgid "This user hasn't filled in their profile (yet)." -msgstr "" +msgstr "這個使用者還沒(來得及)填寫個人檔案。" #: mediagoblin/templates/mediagoblin/user_pages/user.html:122 #, python-format @@ -368,26 +396,30 @@ msgstr "查看%(username)s的全部媒體檔案" msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." -msgstr "" +msgstr "這個地方是你的媒體會出現的地方，但是你似乎還沒有加入東西。" #: mediagoblin/templates/mediagoblin/user_pages/user.html:141 msgid "Add media" -msgstr "" +msgstr "新增媒體" #: mediagoblin/templates/mediagoblin/user_pages/user.html:147 msgid "There doesn't seem to be any media here yet..." -msgstr "" +msgstr "似乎還沒有任何的媒體..." #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21 msgid "feed icon" -msgstr "" +msgstr "feed圖示" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:23 msgid "Atom feed" -msgstr "" +msgstr "Atom feed" #: mediagoblin/user_pages/forms.py:24 msgid "Comment" +msgstr "評論" + +#: mediagoblin/user_pages/views.py:176 +msgid "You are about to delete another user's media. Proceed with caution." msgstr "" diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py index 1340da60..f78658c5 100644 --- a/mediagoblin/routing.py +++ b/mediagoblin/routing.py @@ -21,6 +21,7 @@ from mediagoblin.submit.routing import submit_routes from mediagoblin.user_pages.routing import user_routes from mediagoblin.edit.routing import edit_routes from mediagoblin.listings.routing import tag_routes +from mediagoblin.confirm.routing import confirm_routes def get_mapper(): diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 1852b70c..3d9f90f6 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -208,6 +208,14 @@ text-align: center; margin-bottom: 4px; } +.form_field_label { + font-size:1.125em; +} + +.form_field_description { + font-style: italic; +} + .form_field_error { background-color: #87453b; color: #fff; diff --git a/mediagoblin/storage.py b/mediagoblin/storage.py index 7765b668..24a9da6f 100644 --- a/mediagoblin/storage.py +++ b/mediagoblin/storage.py @@ -313,7 +313,8 @@ class CloudFilesStorage(StorageInterface): def delete_file(self, filepath): # TODO: Also delete unused directories if empty (safely, with # checks to avoid race conditions). - self.container.delete_object(filepath) + self.container.delete_object( + self._resolve_filepath(filepath)) def file_url(self, filepath): return '/'.join([ diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py index 4481adeb..b9395145 100644 --- a/mediagoblin/submit/views.py +++ b/mediagoblin/submit/views.py @@ -55,10 +55,10 @@ def submit_start(request): entry = request.db.MediaEntry() entry['_id'] = ObjectId() entry['title'] = ( - request.POST['title'] + unicode(request.POST['title']) or unicode(splitext(filename)[0])) - entry['description'] = request.POST.get('description') + entry['description'] = unicode(request.POST.get('description')) entry['description_html'] = cleaned_markdown_conversion( entry['description']) diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 32d5a5d2..79f5b3d0 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -87,7 +87,7 @@ <div class="container_16"> <div class="grid_16 mediagoblin_footer"> {% trans -%} - Powered by <a href="http://mediagoblin.org">MediaGoblin</a>, a <a href="http://gnu.org/">GNU project</a> + Powered by <a href="http://mediagoblin.org">MediaGoblin</a>, a <a href="http://gnu.org/">GNU</a> project {%- endtrans %} </div> </div> diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 0425500e..6f00b40b 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -121,15 +121,22 @@ request.user['is_admin'] %} <h3>Temporary button holder</h3> <p> - <a href="{{ request.urlgen('mediagoblin.edit.edit_media', + {% set edit_url = request.urlgen('mediagoblin.edit.edit_media', user= media.uploader().username, - media= media._id) }}" + media= media._id) %} + <a href="{{ edit_url }}" ><img src="{{ request.staticdirect('/images/icon_edit.png') }}" - class="media_icon" />edit</a> + class="media_icon" /></a> + <a href="{{ edit_url }}">{% trans %}edit{% endtrans %}</a> </p> <p> - <img src="{{ request.staticdirect('/images/icon_delete.png') }}" - class="media_icon" />{% trans %}delete{% endtrans %} + {% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete', + user= media.uploader().username, + media= media._id) %} + <a href="{{ delete_url }}" + ><img src="{{ request.staticdirect('/images/icon_delete.png') }}" + class="media_icon" /></a> + <a href="{{ delete_url }}">{% trans %}delete{% endtrans %}</a> </p> {% endif %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html new file mode 100644 index 00000000..87a3ad81 --- /dev/null +++ b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html @@ -0,0 +1,48 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011 Free Software Foundation, Inc +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +#} +{% extends "mediagoblin/base.html" %} + +{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} + +{% block mediagoblin_content %} + + <form action="{{ request.urlgen('mediagoblin.user_pages.media_confirm_delete', + user=media.uploader().username, + media=media._id) }}" + method="POST" enctype="multipart/form-data"> + <div class="grid_8 prefix_1 suffix_1 edit_box form_box"> + <h1> + {%- trans title=media['title'] -%} + Really delete {{ title }}? + {%- endtrans %} + </h1> + <p> + <em> + {%- trans -%} + If you choose yes, the media entry will be deleted <strong>permanently.</strong> + {%- endtrans %} + </em> + </p> + + {{ wtforms_util.render_divs(form) }} + <div class="form_submit_buttons"> + <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button" /> + </div> + </div> + </form> +{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/utils/prev_next.html b/mediagoblin/templates/mediagoblin/utils/prev_next.html index 7cf8d2a4..8c0cee02 100644 --- a/mediagoblin/templates/mediagoblin/utils/prev_next.html +++ b/mediagoblin/templates/mediagoblin/utils/prev_next.html @@ -20,27 +20,29 @@ {% set prev_entry_url = media.url_to_prev(request.urlgen) %} {% set next_entry_url = media.url_to_next(request.urlgen) %} -<div> - {# There are no previous entries for the very first media entry #} - {% if prev_entry_url %} - <a class="navigation_button navigation_left" href="{{ prev_entry_url }}"> - <img src="/mgoblin_static/images/navigation_left.png" alt="Previous image" /> - </a> - {% else %} - {# This is the first entry. display greyed-out 'previous' image #} - <p class="navigation_button navigation_left"> - <img src="/mgoblin_static/images/navigation_end.png" alt="No previous images" /> - </p> - {% endif %} - {# Likewise, this could be the very last media entry #} - {% if next_entry_url %} - <a class="navigation_button" href="{{ next_entry_url }}"> - <img src="/mgoblin_static/images/navigation_right.png" alt="Next image" /> - </a> - {% else %} - {# This is the last entry. display greyed-out 'next' image #} - <p class="navigation_button"> - <img src="/mgoblin_static/images/navigation_end.png" alt="No following images" /> - </p> - {% endif %} -</div> +{% if prev_entry_url or next_entry_url %} + <div class="grid_5 alpha omega"> + {# There are no previous entries for the very first media entry #} + {% if prev_entry_url %} + <a class="navigation_button navigation_left" href="{{ prev_entry_url }}"> + <img src="/mgoblin_static/images/navigation_left.png" alt="Previous image" /> + </a> + {% else %} + {# This is the first entry. display greyed-out 'previous' image #} + <p class="navigation_button navigation_left"> + <img src="/mgoblin_static/images/navigation_end.png" alt="No previous images" /> + </p> + {% endif %} + {# Likewise, this could be the very last media entry #} + {% if next_entry_url %} + <a class="navigation_button" href="{{ next_entry_url }}"> + <img src="/mgoblin_static/images/navigation_right.png" alt="Next image" /> + </a> + {% else %} + {# This is the last entry. display greyed-out 'next' image #} + <p class="navigation_button"> + <img src="/mgoblin_static/images/navigation_end.png" alt="No following images" /> + </p> + {% endif %} + </div> +{% endif %} diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py index 9ae129cd..43a81f02 100644 --- a/mediagoblin/tests/test_submission.py +++ b/mediagoblin/tests/test_submission.py @@ -17,7 +17,7 @@ import urlparse import pkg_resources -from nose.tools import assert_equal +from nose.tools import assert_equal, assert_true, assert_false from mediagoblin.auth import lib as auth_lib from mediagoblin.tests.tools import setup_fresh_app, get_test_app @@ -53,6 +53,8 @@ class TestSubmission: test_user['pw_hash'] = auth_lib.bcrypt_gen_password_hash('toast') test_user.save() + self.test_user = test_user + self.test_app.post( '/auth/login/', { 'username': u'chris', @@ -150,6 +152,63 @@ class TestSubmission: u'Tags must be shorter than 50 characters. Tags that are too long'\ ': ffffffffffffffffffffffffffuuuuuuuuuuuuuuuuuuuuuuuuuu'] + def test_delete(self): + util.clear_test_template_context() + response = self.test_app.post( + '/submit/', { + 'title': 'Balanced Goblin', + }, upload_files=[( + 'file', GOOD_JPG)]) + + # Post image + response.follow() + + request = util.TEMPLATE_TEST_CONTEXT[ + 'mediagoblin/user_pages/user.html']['request'] + + media = request.db.MediaEntry.find({'title': 'Balanced Goblin'})[0] + + # Does media entry exist? + assert_true(media) + + # Do not confirm deletion + # --------------------------------------------------- + response = self.test_app.post( + request.urlgen('mediagoblin.user_pages.media_confirm_delete', + # No work: user=media.uploader().username, + user=self.test_user['username'], + media=media['_id']), + {'confirm': 'False'}) + + response.follow() + + request = util.TEMPLATE_TEST_CONTEXT[ + 'mediagoblin/user_pages/user.html']['request'] + + media = request.db.MediaEntry.find({'title': 'Balanced Goblin'})[0] + + # Does media entry still exist? + assert_true(media) + + # Confirm deletion + # --------------------------------------------------- + response = self.test_app.post( + request.urlgen('mediagoblin.user_pages.media_confirm_delete', + # No work: user=media.uploader().username, + user=self.test_user['username'], + media=media['_id']), + {'confirm': 'True'}) + + response.follow() + + request = util.TEMPLATE_TEST_CONTEXT[ + 'mediagoblin/user_pages/user.html']['request'] + + # Does media entry still exist? + assert_false( + request.db.MediaEntry.find( + {'_id': media['_id']}).count()) + def test_malicious_uploads(self): # Test non-suppoerted file with non-supported extension # ----------------------------------------------------- diff --git a/mediagoblin/user_pages/forms.py b/mediagoblin/user_pages/forms.py index 25001019..4a79bedd 100644 --- a/mediagoblin/user_pages/forms.py +++ b/mediagoblin/user_pages/forms.py @@ -23,3 +23,10 @@ class MediaCommentForm(wtforms.Form): comment_content = wtforms.TextAreaField( _('Comment'), [wtforms.validators.Required()]) + + +class ConfirmDeleteForm(wtforms.Form): + confirm = wtforms.RadioField('Confirm', + default='False', + choices=[('False', 'No, I made a mistake!'), + ('True', 'Yes, delete it!')]) diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index 65c0fa64..ffa6f969 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -32,6 +32,9 @@ user_routes = [ Route('mediagoblin.edit.attachments', '/{user}/m/{media}/attachments/', controller="mediagoblin.edit.views:edit_attachments"), + Route('mediagoblin.user_pages.media_confirm_delete', + "/{user}/m/{media}/confirm-delete/", + controller="mediagoblin.user_pages.views:media_confirm_delete"), Route('mediagoblin.user_pages.atom_feed', '/{user}/atom/', controller="mediagoblin.user_pages.views:atom_feed"), Route('mediagoblin.user_pages.media_post_comment', diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 2d9bcd21..06b0be5b 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -20,11 +20,12 @@ from mediagoblin import messages, mg_globals from mediagoblin.db.util import DESCENDING, ObjectId from mediagoblin.util import ( Pagination, render_to_response, redirect, cleaned_markdown_conversion, - render_404) + render_404, delete_media_files) +from mediagoblin.util import pass_to_ugettext as _ from mediagoblin.user_pages import forms as user_forms from mediagoblin.decorators import (uses_pagination, get_user_media_entry, - require_active_login) + require_active_login, user_may_delete_media) from werkzeug.contrib.atom import AtomFeed @@ -130,7 +131,7 @@ def media_post_comment(request): comment = request.db.MediaComment() comment['media_entry'] = ObjectId(request.matchdict['media']) comment['author'] = request.user['_id'] - comment['content'] = request.POST['comment_content'] + comment['content'] = unicode(request.POST['comment_content']) comment['content_html'] = cleaned_markdown_conversion(comment['content']) @@ -145,6 +146,43 @@ def media_post_comment(request): user = request.matchdict['user']) +@get_user_media_entry +@require_active_login +@user_may_delete_media +def media_confirm_delete(request, media): + + form = user_forms.ConfirmDeleteForm(request.POST) + + if request.method == 'POST' and form.validate(): + if request.POST.get('confirm') == 'True': + username = media.uploader()['username'] + + # Delete all files on the public storage + delete_media_files(media) + + media.delete() + + return redirect(request, "mediagoblin.user_pages.user_home", + user=username) + else: + return redirect(request, "mediagoblin.user_pages.media_home", + user=media.uploader()['username'], + media=media['slug']) + + if ((request.user[u'is_admin'] and + request.user[u'_id'] != media.uploader()[u'_id'])): + messages.add_message( + request, messages.WARNING, + _("You are about to delete another user's media. " + "Proceed with caution.")) + + return render_to_response( + request, + 'mediagoblin/user_pages/media_confirm_delete.html', + {'media': media, + 'form': form}) + + ATOM_DEFAULT_NR_OF_UPDATED_ITEMS = 15 def atom_feed(request): diff --git a/mediagoblin/util.py b/mediagoblin/util.py index ba4ac01e..27c81f3a 100644 --- a/mediagoblin/util.py +++ b/mediagoblin/util.py @@ -681,3 +681,18 @@ def render_404(request): """ return render_to_response( request, 'mediagoblin/404.html', {}, status=400) + +def delete_media_files(media): + """ + Delete all files associated with a MediaEntry + + Arguments: + - media: A MediaEntry document + """ + for handle, listpath in media['media_files'].items(): + mg_globals.public_store.delete_file( + listpath) + + for attachment in media['attachment_files']: + mg_globals.public_store.delete_file( + attachment['filepath']) |